Fixing admin conflicts