Various Sonos fixes - see individual commits