diff --git a/Makefile b/Makefile
index 5a5dbc86..f756c8a8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 
 all:
 	python setup.py build_ext --inplace
+	git update-index --assume-unchanged scikits/image/version.py
 
 clean:
 	find . -name "*.so" | xargs rm
diff --git a/scikits/image/graph/spath.pxd b/scikits/image/graph/spath.pxd
index f805f127..35fbae27 100644
--- a/scikits/image/graph/spath.pxd
+++ b/scikits/image/graph/spath.pxd
@@ -1,3 +1,3 @@
 cimport numpy as np
 
-cpdef shortest_path(np.ndarray, int)
\ No newline at end of file
+cpdef shortest_path(np.ndarray, int reach=?)
\ No newline at end of file
diff --git a/scikits/image/morphology/cmorph.pyx b/scikits/image/morphology/cmorph.pyx
index c0c1d920..5572102c 100644
--- a/scikits/image/morphology/cmorph.pyx
+++ b/scikits/image/morphology/cmorph.pyx
@@ -22,8 +22,8 @@ cdef inline int int_min(int a, int b): return a if a <= b else b
 def dilate(np.ndarray[IMAGE_DTYPE_t, ndim=2] image not None,
            np.ndarray[IMAGE_DTYPE_t, ndim=2] selem not None,
            np.ndarray[IMAGE_DTYPE_t, ndim=2] out):
-    cdef int hw = selem.shape[0] / 2
-    cdef int hh = selem.shape[1] / 2
+    cdef int hw = selem.shape[0] // 2
+    cdef int hh = selem.shape[1] // 2
     cdef int width = image.shape[0], height = image.shape[1]
     if out is None:
         out = np.zeros([width, height], dtype=IMAGE_DTYPE)
@@ -65,8 +65,8 @@ def dilate(np.ndarray[IMAGE_DTYPE_t, ndim=2] image not None,
 def erode(np.ndarray[IMAGE_DTYPE_t, ndim=2] image not None,
           np.ndarray[IMAGE_DTYPE_t, ndim=2] selem not None,
           np.ndarray[IMAGE_DTYPE_t, ndim=2] out):
-    cdef int hw = selem.shape[0] / 2
-    cdef int hh = selem.shape[1] / 2
+    cdef int hw = selem.shape[0] // 2
+    cdef int hh = selem.shape[1] // 2
     cdef int width = image.shape[0], height = image.shape[1]
     if out is None:
         out = np.zeros([width, height], dtype=IMAGE_DTYPE)