Trying some things to fix Windows 8 builds.