Fix bugs after admin panel changed