Fixes for the Build on Windows