diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index c4b10dc..18d15e1 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -473,7 +473,7 @@
 new_buffersize(PyFileObject *f, size_t currentsize)
 {
 #ifdef HAVE_FSTAT
-	long pos, end;
+	off_t pos, end;
 	struct stat st;
 	if (fstat(fileno(f->f_fp), &st) == 0) {
 		end = st.st_size;
diff --git a/Objects/intobject.c b/Objects/intobject.c
index b0ed82a..282da20 100644
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -645,7 +645,7 @@
 	if (b >= LONG_BIT) {
 		return PyInt_FromLong(0L);
 	}
-	a = (unsigned long)a << b;
+	a = (long)((unsigned long)a << b);
 	return PyInt_FromLong(a);
 }