(MSVC) Build fixes