Finalized minor /adminteam bugs