Some admin tool updates