More minor patches to support updated upstream packages.