Patches from upstream repo