CFY-949 more fixes