Feature dependencies

More dependency fixes
Through*