Fixed missing resources, tag circular dependency.