Some extra clean up for CLI after #400