Build fixes for 32-bit windows