Few improvements to log messages