diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 9a9b375f8..ae69e0760 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -4383,7 +4383,7 @@ void TrackPanel::HandleSampleEditingClick( wxMouseEvent & event )
 
       //Get a sample  from the track to do some tricks on.
       mDrawingTrack->Get((samplePtr)sampleRegion, floatSample,
-                                       (int)mDrawingStartSample - SMOOTHING_KERNEL_RADIUS - SMOOTHING_BRUSH_RADIUS,
+                                       mDrawingStartSample - SMOOTHING_KERNEL_RADIUS - SMOOTHING_BRUSH_RADIUS,
                                        sampleRegionSize);
       int i, j;
 
diff --git a/src/WaveClip.cpp b/src/WaveClip.cpp
index 7074da3cf..47913e04d 100644
--- a/src/WaveClip.cpp
+++ b/src/WaveClip.cpp
@@ -426,7 +426,7 @@ void WaveClip::ClearWaveCache()
 }
 
 ///Adds an invalid region to the wavecache so it redraws that portion only.
-void WaveClip::AddInvalidRegion(long startSample, long endSample)
+void WaveClip::AddInvalidRegion(sampleCount startSample, sampleCount endSample)
 {
    ODLocker locker(&mWaveCacheMutex);
    if(mWaveCache!=NULL)
diff --git a/src/WaveClip.h b/src/WaveClip.h
index c12f2f989..08d601354 100644
--- a/src/WaveClip.h
+++ b/src/WaveClip.h
@@ -360,7 +360,7 @@ public:
    void ClearWaveCache();
 
    ///Adds an invalid region to the wavecache so it redraws that portion only.
-   void AddInvalidRegion(long startSample, long endSample);
+   void AddInvalidRegion(sampleCount startSample, sampleCount endSample);
 
    //
    // XMLTagHandler callback methods for loading and saving