Fix up brokeness.