Cleaned up some WebRTC merge issues