The rest of the logging changes