Master fixes for Windows and OSX

Windows and OSX master builds are currently broken. Right now TeamCity is down. My Windows VM bit the dust so I need to rebuild it (what fun). After I bring this back up I'm going to merge this in.