Add 0.9-hangover monkeypatches