CB-5816 corrected some logging