Merge "Fixed 64-bit porting issues"