CFY-1232 small changes