Some 32-bit fixes.