Bugfix: circular dependency
Bugfix: wrong namespace for pkg_deps