Cleaned up MSVC fixes