Fixes for 64-bit ABI