CFY-1272 fixes in the middle of the review