Fixes for building 32bit.

r? @zwarich