CLC-2517 Tweak log statements