Windows build

Minor modifications to clean up the build on all platforms