DidlBuilder changes & Sonos Fix