More diagnostic changes.