Fixes #816
Removed schemas no longer show in the invalid count list. Fixes #805
Merge pull request #851 from delving/13.03-fixes

13.03 fixes