Basic fixes for Windows Build