diff --git a/components/files/constrainedfiledatastream.cpp b/components/files/constrainedfiledatastream.cpp
index 63bd3490f6..dd2985e561 100644
--- a/components/files/constrainedfiledatastream.cpp
+++ b/components/files/constrainedfiledatastream.cpp
@@ -3,7 +3,11 @@
 
 #include <stdexcept>
 #include <cassert>
+#ifndef __clang__
 #include <cstdint>
+#else
+#include <tr1/cstdint>
+#endif
 
 namespace {
 
diff --git a/components/translation/translation.cpp b/components/translation/translation.cpp
index 184cf399cd..d0ea4b7fb6 100644
--- a/components/translation/translation.cpp
+++ b/components/translation/translation.cpp
@@ -30,7 +30,7 @@ namespace Translation
         {
             std::string path = dataFileCollections.getCollection (extension).getPath (fileName).string();
 
-            std::ifstream stream (path);
+            std::ifstream stream (path.c_str());
 
             if (!stream.is_open())
                 throw std::runtime_error ("failed to open translation file: " + fileName);