Additional fixes for 64-bit ABI