diff --git a/Samples/multimedia/directshow/baseclasses/wxdebug.cpp b/Samples/multimedia/directshow/baseclasses/wxdebug.cpp
index 3c43303..5763891 100644
--- a/Samples/multimedia/directshow/baseclasses/wxdebug.cpp
+++ b/Samples/multimedia/directshow/baseclasses/wxdebug.cpp
@@ -1234,7 +1234,7 @@
     hr = pUnk->QueryInterface(IID_IPin, (void **)&pp);
     if(SUCCEEDED(hr))
     {
-        CDisp::CDisp(pp);
+        CDisp::CDisp(static_cast<IPin*>(pp));
         pp->Release();
         return;
     }
diff --git a/Samples/multimedia/directshow/baseclasses/wxutil.cpp b/Samples/multimedia/directshow/baseclasses/wxutil.cpp
index 5bc97a9..a79153b 100644
--- a/Samples/multimedia/directshow/baseclasses/wxutil.cpp
+++ b/Samples/multimedia/directshow/baseclasses/wxutil.cpp
@@ -381,7 +381,7 @@
 {
     void * ret = dst;
 
-#ifdef _X86_
+#if defined(_X86_) && !defined(__clang__)
     if (dst <= src || (char *)dst >= ((char *)src + count)) {
 
         /*
diff --git a/codereview.settings b/codereview.settings
new file mode 100644
index 0000000..383ab85
--- /dev/null
+++ b/codereview.settings
@@ -0,0 +1,3 @@
+# This file is used by gcl to get repository specific information.
+CODE_REVIEW_SERVER: codereview.webrtc.org
+CC_LIST: webrtc-reviews@webrtc.org
\ No newline at end of file