Some logging corrected.