Apply various fixes, so CI on master_staging_systemd runs through. See individual commits for details.