Minor logging related improvement