Admin functionalities fixes