* Fix dependency cycle issues, hopefully