Slight improvements to logged messages