CFY-1840 some more minor fixes