Various fixes/improvements to Admin