Pull the fixes for 64-bit and rotation