admin: Various fixes