Minor updates for diagnostics