more fixes for gitian win32 build