Misc patches for misc software