CFY-3 small changes