Minor changes with GP main merged