Fix a few quirks.