CFY-1222 some more fixes