Minor changes Windows compilation problems