Fixing dependencies