Fixing more CS issues from Insight