Changes to support the switch to pipewire

No match.