Resolved some problems with dependencies.