Also fix the 32-bit compat calls.