CFY-1308 minor fixes