Fixes for windows
Fixes for windows
Fixes for windows