Improved some logging messages