Fix extends clauses