Fixes for Windows - probably