VS compat changes