CFY-734 bug fixes