Minor change in the message
Fix some of the logging messages