Logging-related updates