Fixed some sependency issues