Admin controller fixes