Fixes for recent changes to Arch packages.