Fixed the CLI apps.