(MSVC) Some build fixes