(MSVC VB) Some build fixes