Fixing dependecies