admin fixes (?)