Minor changes in controller