Fix diagnostic fix up