Admin: Various updates from #1923