Fix according to comments
Fix according to comments

xdumaine/adapter,xdumaine/adapter,Acidburn0zzz/adapter,webrtc/adapter,jan-ivar/adapter,webrtc/adapter,Acidburn0zzz/adapter,Acidburn0zzz/adapter,jan-ivar/adapter