diff --git a/OpenEXR/IlmImf/ImfB44Compressor.cpp b/OpenEXR/IlmImf/ImfB44Compressor.cpp
index f13e143f52..3b18ba8551 100644
--- a/OpenEXR/IlmImf/ImfB44Compressor.cpp
+++ b/OpenEXR/IlmImf/ImfB44Compressor.cpp
@@ -484,6 +484,8 @@ B44Compressor::B44Compressor
     _channels (hdr.channels()),
     _channelData (0)
 {
+    // TODO: Remove this when we can change the ABI
+    (void)_maxScanLineSize;
     //
     // Allocate buffers for compressed an uncompressed pixel data,
     // allocate a set of ChannelData structs to help speed up the
diff --git a/OpenEXR/IlmImf/ImfPizCompressor.cpp b/OpenEXR/IlmImf/ImfPizCompressor.cpp
index 8b3ee38c3c..7a49d42d93 100644
--- a/OpenEXR/IlmImf/ImfPizCompressor.cpp
+++ b/OpenEXR/IlmImf/ImfPizCompressor.cpp
@@ -183,8 +183,9 @@ PizCompressor::PizCompressor
     _channels (hdr.channels()),
     _channelData (0)
 {
-    size_t tmpBufferSize =
-                uiMult (maxScanLineSize, numScanLines) / 2;
+    // TODO: Remove this when we can change the ABI
+    (void) _maxScanLineSize;
+    size_t tmpBufferSize = uiMult (maxScanLineSize, numScanLines) / 2;
 
     size_t outBufferSize =
                 uiAdd (uiMult (maxScanLineSize, numScanLines),
diff --git a/OpenEXR/IlmImf/ImfZipCompressor.cpp b/OpenEXR/IlmImf/ImfZipCompressor.cpp
index b0d6989bb4..988549b5d3 100644
--- a/OpenEXR/IlmImf/ImfZipCompressor.cpp
+++ b/OpenEXR/IlmImf/ImfZipCompressor.cpp
@@ -60,7 +60,9 @@ ZipCompressor::ZipCompressor
     _outBuffer (0),
     _zip(maxScanLineSize, numScanLines)
 {
-    _outBuffer = new char[_zip.maxCompressedSize()];
+    // TODO: Remove this when we can change the ABI
+    (void) _maxScanLineSize;
+    _outBuffer = new char[_zip.maxCompressedSize ()];
 }
 
 
@@ -124,4 +126,3 @@ ZipCompressor::uncompress (const char *inPtr,
 
 
 OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_EXIT
-
diff --git a/OpenEXR/IlmImfTest/testBadTypeAttributes.cpp b/OpenEXR/IlmImfTest/testBadTypeAttributes.cpp
index 31a9d51f1a..192f83c2b2 100644
--- a/OpenEXR/IlmImfTest/testBadTypeAttributes.cpp
+++ b/OpenEXR/IlmImfTest/testBadTypeAttributes.cpp
@@ -127,6 +127,7 @@ template<class T> void readTiledThing(T & input,bool test)
 		case NUM_LEVELMODES:
 		default:
 			std::cerr << "Invalid tile mode " << int(t.mode) << std::endl;
+            x_levels = y_levels = 0;
 			break;
     }
 
@@ -409,4 +410,3 @@ void testBadTypeAttributes(const std::string & tempDir)
       
       cout << "ok\n" << endl;
 }
-
diff --git a/OpenEXR/IlmImfTest/testCopyDeepScanLine.cpp b/OpenEXR/IlmImfTest/testCopyDeepScanLine.cpp
index e967376098..aba70507f6 100644
--- a/OpenEXR/IlmImfTest/testCopyDeepScanLine.cpp
+++ b/OpenEXR/IlmImfTest/testCopyDeepScanLine.cpp
@@ -68,8 +68,8 @@ const int minX = 42;
 const int minY = 51;
 const Box2i dataWindow(V2i(minX, minY), V2i(minX + width - 1, minY + height - 1));
 const Box2i displayWindow(V2i(0, 0), V2i(minX + width * 2, minY + height * 2));
-const char source_filename[] = IMF_TMP_DIR "imf_test_copy_deep_scanline_source.exr";
-const char copy_filename[]  = IMF_TMP_DIR "imf_test_copy_deep_scanline_copy.exr";
+//const char source_filename[] = IMF_TMP_DIR "imf_test_copy_deep_scanline_source.exr";
+//const char copy_filename[]  = IMF_TMP_DIR "imf_test_copy_deep_scanline_copy.exr";
 
 vector<int> channelTypes;
 Array2D<unsigned int> sampleCount;
diff --git a/OpenEXR/IlmImfTest/testDeepScanLineMultipleRead.cpp b/OpenEXR/IlmImfTest/testDeepScanLineMultipleRead.cpp
index a92d0a30d8..b7650b8a93 100644
--- a/OpenEXR/IlmImfTest/testDeepScanLineMultipleRead.cpp
+++ b/OpenEXR/IlmImfTest/testDeepScanLineMultipleRead.cpp
@@ -51,7 +51,7 @@
 
 namespace{
 
-const char source_filename[] = IMF_TMP_DIR "imf_test_multiple_read.exr";
+//const char source_filename[] = IMF_TMP_DIR "imf_test_multiple_read.exr";
     
 using std::cout;
 using std::endl;
diff --git a/PyIlmBase/PyImath/PyImathFixedMatrix.h b/PyIlmBase/PyImath/PyImathFixedMatrix.h
index d74400bc50..b2e2e12ca9 100644
--- a/PyIlmBase/PyImath/PyImathFixedMatrix.h
+++ b/PyIlmBase/PyImath/PyImathFixedMatrix.h
@@ -40,6 +40,10 @@
 #include "PyImathFixedArray.h"
 #include "PyImathOperators.h"
 
+#ifdef __clang__
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wself-assign-overloaded"
+#endif
 namespace PyImath {
 
 //
@@ -540,5 +544,8 @@ static void add_bitwise_math_functions(boost::python::class_<FixedMatrix<T> > &c
 
 
 }
+#ifdef __clang__
+#    pragma clang diagnostic pop
+#endif
 
 #endif
diff --git a/PyIlmBase/PyImath/PyImathLine.cpp b/PyIlmBase/PyImath/PyImathLine.cpp
index b332d1ee6c..be114694d5 100644
--- a/PyIlmBase/PyImath/PyImathLine.cpp
+++ b/PyIlmBase/PyImath/PyImathLine.cpp
@@ -348,8 +348,7 @@ intersect2(Line3<T> &line, const Vec3<T> &v0, const Vec3<T> &v1, const Vec3<T> &
     
     if(IMATH_NAMESPACE::intersect(line, v0, v1, v2, pt, bar, front))
     {
-        tuple t = make_tuple(pt, bar, front);
-        return t;
+        return make_tuple (pt, bar, front);
     }
     else
     {
@@ -591,5 +590,3 @@ template PYIMATH_EXPORT class_<Line3<float> > register_Line<float>();
 template PYIMATH_EXPORT class_<Line3<double> > register_Line<double>();
 
 } // namespace PyImath
-
-