[General] Added a couple of diagnostic points.