admin tools fixes