Replaced night monkeypatches