diff --git a/core/slice/ptr.odin b/core/slice/ptr.odin
index 214b745f7..e2f1c3e7b 100644
--- a/core/slice/ptr.odin
+++ b/core/slice/ptr.odin
@@ -73,24 +73,26 @@ ptr_rotate :: proc(left: int, mid: ^$T, right: int) {
 		left, mid, right := left, mid, right
 
 		// TODO(bill): Optimization with a buffer for smaller ranges
-		if left >= right {
-			for {
-				ptr_swap_non_overlapping(ptr_sub(mid, right), mid, right)
-				mid = ptr_sub(mid, right)
+		for left > 0 && right > 0 {
+			if left >= right {
+				for {
+					ptr_swap_non_overlapping(ptr_sub(mid, right), mid, right * size_of(T))
+					mid = ptr_sub(mid, right)
 
-				left -= right
-				if left < right {
-					break
+					left -= right
+					if left < right {
+						break
+					}
 				}
-			}
-		} else {
-			for {
-				ptr_swap_non_overlapping(ptr_sub(mid, left), mid, left)
-				mid = ptr_add(mid, left)
+			} else {
+				for {
+					ptr_swap_non_overlapping(ptr_sub(mid, left), mid, left * size_of(T))
+					mid = ptr_add(mid, left)
 
-				right -= left
-				if right < left {
-					break
+					right -= left
+					if right < left {
+						break
+					}
 				}
 			}
 		}
diff --git a/core/slice/slice.odin b/core/slice/slice.odin
index 032a8ca6e..595ec8e37 100644
--- a/core/slice/slice.odin
+++ b/core/slice/slice.odin
@@ -218,8 +218,10 @@ rotate_left :: proc(array: $T/[]$E, mid: int) {
 	n := len(array)
 	m := mid %% n
 	k := n - m
-	p := raw_data(array)
-	ptr_rotate(mid, ptr_add(p, mid), k)
+	// FIXME: (ap29600) this cast is a temporary fix for the compiler not matching
+	// [^T] with $P/^$T
+	p := cast(^E)raw_data(array)
+	ptr_rotate(m, ptr_add(p, m), k)
 }
 rotate_right :: proc(array: $T/[]$E, k: int) {
 	rotate_left(array, -k)
@@ -515,4 +517,4 @@ dot_product :: proc(a, b: $S/[]$T) -> (r: T, ok: bool)
 enumerated_array :: proc(ptr: ^$T) -> []intrinsics.type_elem_type(T)
 	where intrinsics.type_is_enumerated_array(T) {
 	return ([^]intrinsics.type_elem_type(T))(ptr)[:len(T)]
-}
\ No newline at end of file
+}