fixes for problems found setting up on Windows