Misc. patches created by the archive maintainer.