Windows gitian build fixes