CFY-1000 minor fixes