Incorporate downstream patches

There are a number of downstream patches from Ubuntu/Debian to fix defects. We should upstream these patches.