Fix some bugs after switching to new route for admin