CFY-516 minor fixes