Pointer size fixes for 64 bit support (again).