diff --git a/TimeStepping.pyx b/TimeStepping.pyx
index cb06291c..5e7483d9 100644
--- a/TimeStepping.pyx
+++ b/TimeStepping.pyx
@@ -14,7 +14,6 @@ cimport mpi4py.libmpi as mpi
 import numpy as np
 cimport numpy as np
 
-import cython
 from libc.math cimport fmin, fmax, fabs
 
 cdef class TimeStepping:
@@ -225,20 +224,20 @@ cdef class TimeStepping:
         cdef:
             double cfl_max_local = -9999.0
             double [3] dxi = Gr.dims.dxi
-            long u_shift = PV.get_varshift(Gr,'u')
-            long v_shift = PV.get_varshift(Gr,'v')
-            long w_shift = PV.get_varshift(Gr,'w')
-            long imin = Gr.dims.gw
-            long jmin = Gr.dims.gw
-            long kmin = Gr.dims.gw
-            long imax = Gr.dims.nlg[0] - Gr.dims.gw
-            long jmax = Gr.dims.nlg[1] - Gr.dims.gw
-            long kmax = Gr.dims.nlg[2] - Gr.dims.gw
-            long istride = Gr.dims.nlg[1] * Gr.dims.nlg[2]
-            long jstride = Gr.dims.nlg[2]
-            long i,j,k, ijk, ishift, jshift
+            Py_ssize_t u_shift = PV.get_varshift(Gr,'u')
+            Py_ssize_t v_shift = PV.get_varshift(Gr,'v')
+            Py_ssize_t w_shift = PV.get_varshift(Gr,'w')
+            Py_ssize_t imin = Gr.dims.gw
+            Py_ssize_t jmin = Gr.dims.gw
+            Py_ssize_t kmin = Gr.dims.gw
+            Py_ssize_t imax = Gr.dims.nlg[0] - Gr.dims.gw
+            Py_ssize_t jmax = Gr.dims.nlg[1] - Gr.dims.gw
+            Py_ssize_t kmax = Gr.dims.nlg[2] - Gr.dims.gw
+            Py_ssize_t istride = Gr.dims.nlg[1] * Gr.dims.nlg[2]
+            Py_ssize_t jstride = Gr.dims.nlg[2]
+            Py_ssize_t i,j,k, ijk, ishift, jshift
             double w
-            long isedv
+            Py_ssize_t isedv
 
         with nogil:
             for i in xrange(imin,imax):
@@ -253,8 +252,6 @@ cdef class TimeStepping:
 
                         cfl_max_local = fmax(cfl_max_local, self.dt * (fabs(PV.values[u_shift + ijk])*dxi[0] + fabs(PV.values[v_shift+ijk])*dxi[1] + w*dxi[2]))
 
-                        # cfl_max_local = fmax(cfl_max_local, self.dt * (fabs(PV.values[u_shift + ijk])*dxi[0] + fabs(PV.values[v_shift+ijk])*dxi[1] + fabs(PV.values[w_shift+ijk])*dxi[2]))
-
         mpi.MPI_Allreduce(&cfl_max_local,&self.cfl_max,1,
                           mpi.MPI_DOUBLE,mpi.MPI_MAX,Pa.comm_world)