Clean up build configs and fix wix build.