Reduce some monkey patching