more Windows fixes