Windows compilation updates