Trying to fix some of the dependencies