Fix Visual Studio build regressions.

There really needs to be some sort of continuous integration for this...