Improve log messages