CFY-768 fixes