more build fixes for windows