Fixing bad dependencies