ctl upgrade fixes
19 files changed