Fix cyclical dependencies and unsatisfied dependencies