(MSVC) Some solution fixes