CFY-1761 fix scripts