CFY-3 more fixes