admin: Some fixes