Fixes to Immutable, CTI and a few TODOs after code review