Logging bugs and CLIMessage changes