CFY-1232 bug fixes