Minor changes to controller