minor fixes
windows fixes