Fixed 2 problems with dependencies.