Fixed inter-package dependencies.