CFY-1272 minor fixes