Fixes for 32-bit compile