diff --git a/CONTRIBUTORS b/CONTRIBUTORS
new file mode 100644
index 000000000..c178ec908
--- /dev/null
+++ b/CONTRIBUTORS
@@ -0,0 +1,8 @@
+The following is a partial list of individuals or corporations
+who have identified their contributions to the djinni project.
+
+The complete list of contributors can be identified through
+Git history.
+
+- Google Inc.
+
diff --git a/support-lib/jni/djinni_support.hpp b/support-lib/jni/djinni_support.hpp
index a4fab781f..2b806a3fc 100644
--- a/support-lib/jni/djinni_support.hpp
+++ b/support-lib/jni/djinni_support.hpp
@@ -156,11 +156,11 @@ void jniThrowAssertionError(JNIEnv * env, const char * file, int line, const cha
 
 #define DJINNI_ASSERT_MSG(check, env, message) \
     do { \
-        djinni::jniExceptionCheck(env); \
+        ::djinni::jniExceptionCheck(env); \
         const bool check__res = bool(check); \
-        djinni::jniExceptionCheck(env); \
+        ::djinni::jniExceptionCheck(env); \
         if (!check__res) { \
-            djinni::jniThrowAssertionError(env, __FILE__, __LINE__, message); \
+            ::djinni::jniThrowAssertionError(env, __FILE__, __LINE__, message); \
         } \
     } while(false)
 #define DJINNI_ASSERT(check, env) DJINNI_ASSERT_MSG(check, env, #check)
@@ -340,7 +340,11 @@ template <class T>
 static const std::shared_ptr<T> & objectFromHandleAddress(jlong handle) {
     assert(handle);
     assert(handle > 4096);
-    const auto & ret = reinterpret_cast<const CppProxyHandle<T> *>(handle)->get();
+    // Below line segfaults gcc-4.8. Using a temporary variable hides the bug.
+    //const auto & ret = reinterpret_cast<const CppProxyHandle<T> *>(handle)->get();
+    const CppProxyHandle<T> *proxy_handle =
+        reinterpret_cast<const CppProxyHandle<T> *>(handle);
+    const auto & ret = proxy_handle->get();
     assert(ret);
     return ret;
 }
diff --git a/support-lib/proxy_cache_interface.hpp b/support-lib/proxy_cache_interface.hpp
index 98f2b1917..73123c8bf 100644
--- a/support-lib/proxy_cache_interface.hpp
+++ b/support-lib/proxy_cache_interface.hpp
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <memory>
 #include <functional>
 #include <typeindex>