CFY-747: cleanups, fixes, CFY-352