Some more fixes.
More fixes for the diagnostics gui.