Minor fixes to controllers and views