Fixes to controllers