ctl upgrade fixes
23 files changed