Diagnostics updates