Fixes to CTI