More controller fixes