Fixes for 32-bit windows