CFY-1196 minor fixes