More changes to the logging system