windows and 32bit build fixes