All fixes suggested by @City-busz in the AUR.