Added two more diagnostic fields.