Hash quirk fixes