Various and sundry diagnostics area improvements.