64-bit fixes.