addressing some issues on windows