Patch up what the patch couldn't ;)