CFY-800 small changes