Some minor housekeeping on admin