fix a heap of types, especially dependents