CFY-1222 bug fixes