More controller fixes.