More 32bit build fixes