Feature dependencies

More dependency fixes