Fixes for Windows compilation