Fix TBD and class references.