Fixes for Windows
Merge branch 'dev'