Fixing dependencies & samples