CFY-3 small fixes