Fix quirks