Tweaks to our fork to make it work a bit more sanely.