VS-related changes.