msvs build fixes