Temp patch for CLI, update self report.