Bug fixes in the log output