Fixes to various controllers