A few fixes for 32-bit compiles