[#3012] Some controller fixes