CFY-1025 small fixes