More fixes for log message formatting