Fixing samples dependency issues