More admin tuple fixes