Changes for Windows compilation
Changes for Windows compilation