Admin: Fixes and additions