CFY-1215: Fix issues found by manual tests