Fixes to ctl