minor Windows fixes
minor changes