diff --git a/library/PolyVoxCore/include/Region.h b/library/PolyVoxCore/include/Region.h
index 96ca1837..1fec92d7 100644
--- a/library/PolyVoxCore/include/Region.h
+++ b/library/PolyVoxCore/include/Region.h
@@ -29,7 +29,11 @@ freely, subject to the following restrictions:
 
 namespace PolyVox
 {
+#ifdef SWIG
+	class Region
+#else
 	class POLYVOXCORE_API Region
+#endif
 	{
 	public:
 		Region();
diff --git a/library/PolyVoxCore/include/Volume.h b/library/PolyVoxCore/include/Volume.h
index 5d02b8a6..72e10789 100644
--- a/library/PolyVoxCore/include/Volume.h
+++ b/library/PolyVoxCore/include/Volume.h
@@ -153,7 +153,7 @@ namespace PolyVox
 
 		///Resises the volume to the specified dimensions
 		void resize(uint16_t uWidth, uint16_t uHeight, uint16_t uDepth, uint16_t uBlockSideLength = 32);
-		void tidyUpMemory(uint32_t uNoOfBlocksToProcess = (std::numeric_limits<uint32_t>::max)());
+		void tidyUpMemory(uint32_t uNoOfBlocksToProcess = 1000000);
 
 	private:
 		polyvox_shared_ptr< Block<VoxelType> > getHomogenousBlock(VoxelType tHomogenousValue);
diff --git a/library/bindings/PolyVoxCore.i b/library/bindings/PolyVoxCore.i
index 7fa26327..71425b23 100644
--- a/library/bindings/PolyVoxCore.i
+++ b/library/bindings/PolyVoxCore.i
@@ -8,4 +8,8 @@
 //%include "PolyVoxCStdInt.i"
 //%include "Utility.i"
 //%include "PolyVoxForwardDeclarations.i" //Shouldn't be needed
+//
+%include "stdint.i"
 %include "Vector.i"
+%include "Region.i"
+%include "Volume.i"
diff --git a/library/bindings/Vector.i b/library/bindings/Vector.i
index b2c05b95..297ffe8f 100644
--- a/library/bindings/Vector.i
+++ b/library/bindings/Vector.i
@@ -8,11 +8,11 @@
 
 %template(Vector3DFloat) PolyVox::Vector<3,float>;
 %template(Vector3DDouble) PolyVox::Vector<3,double>;
-//%template(Vector3DInt8) PolyVox::Vector<3,int8>;
-//%template(Vector3DUint8) PolyVox::Vector<3,uint8>;
-//%template(Vector3DInt16) PolyVox::Vector<3,int16>;
-//%template(Vector3DUint16) PolyVox::Vector<3,uint16>;
-//%template(Vector3DInt32) PolyVox::Vector<3,int32>;
-//%template(Vector3DUint32) PolyVox::Vector<3,uint32>;
+%template(Vector3DInt8) PolyVox::Vector<3,int8_t>;
+%template(Vector3DUint8) PolyVox::Vector<3,uint8_t>;
+%template(Vector3DInt16) PolyVox::Vector<3,int16_t>;
+%template(Vector3DUint16) PolyVox::Vector<3,uint16_t>;
+%template(Vector3DInt32) PolyVox::Vector<3,int32_t>;
+%template(Vector3DUint32) PolyVox::Vector<3,uint32_t>;
 
 %rename(assign) Vector3DFloat::operator=;