More updates to the logging