Double C&I Fixes