CFY-1049 fix packages