CFY-1419 small fixes