Fix up all the logging