Fixes  on Windows