Windows compilation environment fixes