Import quirks fix