Fix MSVC for a bunch of things...