diff --git a/Objects/intobject.c b/Objects/intobject.c
index 9ffc295..a82b3c8 100644
--- a/Objects/intobject.c
+++ b/Objects/intobject.c
@@ -215,6 +215,10 @@
 
 	if (nb->nb_long != 0) {
 		io = (PyIntObject*) (*nb->nb_long) (op);
+		if (io == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
+			PyErr_Clear();
+			io = (PyIntObject*) (*nb->nb_int) (op);
+		}
 	} else {
 		io = (PyIntObject*) (*nb->nb_int) (op);
 	}
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 6d55354..a8663bc 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -893,7 +893,7 @@
 	int one = 1;
 	return _PyLong_FromByteArray(
 			(unsigned char *)&bytes,
-			SIZEOF_SIZE_T, IS_LITTLE_ENDIAN, 0);
+			SIZEOF_SIZE_T, IS_LITTLE_ENDIAN, 1);
 }
 
 /* Create a new long int object from a C size_t. */