exchange admin fixes