Fix some TODO into EnsembleECO