Minor changes to controllers