sound: some fixes from AndreiLux repo

Change-Id: Id2345efa34ad95447baa1adf6d0842c02b45a4e0