A few fixes for windows builds.