Some further fixes to pending counts in admin class page