Solves some bugs in admin