CFY-1046 bug fixes