Fix improperly removed overrides