Further fixes for windows