Merge "Minor improvement to log statements"