Dependency problems fixed