Fix up the logging