Fixes for Windows builds.