adds some fixes to admin events