quirk fixes