Work on diagnostics
Fix diagnostics filter.
Some fixit work.