diff --git a/indra/llcommon/llfile.h b/indra/llcommon/llfile.h
index d59e68367e..d94b45cc4d 100755
--- a/indra/llcommon/llfile.h
+++ b/indra/llcommon/llfile.h
@@ -185,6 +185,11 @@ protected:
 	*/
 	/*virtual*/ int sync();
 
+// <FS:CR> Clang support
+#if LL_CLANG
+	using llstdio_filebuf::xsputn;
+#endif
+// </FS:CR>
 	std::streamsize xsgetn(char_type*, std::streamsize);
 	std::streamsize xsputn(char_type*, std::streamsize);
 #endif
diff --git a/indra/llvfs/llvfs_objc.h b/indra/llvfs/llvfs_objc.h
index 90101eb2e9..56cdbebfc5 100755
--- a/indra/llvfs/llvfs_objc.h
+++ b/indra/llvfs/llvfs_objc.h
@@ -40,4 +40,4 @@ std::string* getSystemResourceFolder();
 std::string* getSystemExecutableFolder();
 
 
-#endif LL_LLVFS_OBJC_H
+#endif // LL_LLVFS_OBJC_H
diff --git a/indra/llvfs/llvfs_objc.mm b/indra/llvfs/llvfs_objc.mm
index 47b0e73978..227a738bec 100755
--- a/indra/llvfs/llvfs_objc.mm
+++ b/indra/llvfs/llvfs_objc.mm
@@ -48,7 +48,7 @@ std::string* findSystemDirectory(NSSearchPathDirectory searchPathDirectory,
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     
-    std::string *result;
+    std::string *result = NULL;
     NSString *path = nil;
     
     // Search for the path