Resolved some of the dependencies.