Fixes for running things on windows