Merge "Fixed several 64-bit porting issues"