Fix all but a few edge cases.