CFY-1056 fixes and improvements