diff --git a/python/src/buffer.h b/python/src/buffer.h
index a5f426a54..33cda42ca 100644
--- a/python/src/buffer.h
+++ b/python/src/buffer.h
@@ -56,13 +56,13 @@ std::string buffer_format(const array& a) {
 
 struct buffer_info {
   std::string format;
-  std::vector<ssize_t> shape;
-  std::vector<ssize_t> strides;
+  std::vector<Py_ssize_t> shape;
+  std::vector<Py_ssize_t> strides;
 
   buffer_info(
       std::string format,
-      std::vector<ssize_t> shape_in,
-      std::vector<ssize_t> strides_in)
+      std::vector<Py_ssize_t> shape_in,
+      std::vector<Py_ssize_t> strides_in)
       : format(std::move(format)),
         shape(std::move(shape_in)),
         strides(std::move(strides_in)) {}
@@ -91,8 +91,8 @@ extern "C" inline int getbuffer(PyObject* obj, Py_buffer* view, int flags) {
     a.eval();
   }
 
-  std::vector<ssize_t> shape(a.shape().begin(), a.shape().end());
-  std::vector<ssize_t> strides(a.strides().begin(), a.strides().end());
+  std::vector<Py_ssize_t> shape(a.shape().begin(), a.shape().end());
+  std::vector<Py_ssize_t> strides(a.strides().begin(), a.strides().end());
   for (auto& s : strides) {
     s *= a.itemsize();
   }
diff --git a/python/src/indexing.cpp b/python/src/indexing.cpp
index a38323797..197441da9 100644
--- a/python/src/indexing.cpp
+++ b/python/src/indexing.cpp
@@ -603,7 +603,7 @@ std::tuple<std::vector<array>, array, std::vector<int>> mlx_scatter_args_nd(
   }
 
   // Analyse the types of the indices
-  unsigned long max_dim = 0;
+  size_t max_dim = 0;
   bool arrays_first = false;
   int num_none = 0;
   int num_slices = 0;