Add even more upstream bug fix patches
Since the original sub is stuck in leagl que, we might as well add even more upstream fixes while we wait :-)