CFY-747/CFY-352: prefix -- code review -- fixes