Minor changes for Clint