Updates to some admin tools