admin actions fixes