More diagnostics put in.