fixes applied to all VS configurations