more small fixes for windows