CFY-1593 small changes