Small updates to AdminPortal