CFY-509 minor fixes