Fix catalog upload command
Improvements to ensemble manager