diff --git a/lldb/source/Expression/ClangExpression.cpp b/lldb/source/Expression/ClangExpression.cpp
index d01d062c3d60..6922ac4acece 100644
--- a/lldb/source/Expression/ClangExpression.cpp
+++ b/lldb/source/Expression/ClangExpression.cpp
@@ -236,6 +236,7 @@ ClangExpression::CreateCompilerInstance (bool &IsAST)
     // Our hook into Clang's lookup mechanism only works in C++.
     m_clang_ap->getLangOpts().CPlusPlus = true;
     m_clang_ap->getLangOpts().ObjC1 = true;
+    m_clang_ap->getLangOpts().ThreadsafeStatics = false;
 
     // Disable some warnings.
     m_clang_ap->getDiagnosticOpts().Warnings.push_back("no-unused-value");
diff --git a/lldb/source/Expression/IRToDWARF.cpp b/lldb/source/Expression/IRToDWARF.cpp
index 02f0d1953e78..0cca9aa136a4 100644
--- a/lldb/source/Expression/IRToDWARF.cpp
+++ b/lldb/source/Expression/IRToDWARF.cpp
@@ -1,4 +1,4 @@
-//===-- IRToDWARF.cpp ---------------------------------------*- C++ -*-===//
+//===-- IRToDWARF.cpp -------------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -141,7 +141,8 @@ IRToDWARF::runOnBasicBlock(BasicBlock &BB, Relocator &R)
     
     if (log)
     {
-        log->Printf("Translating a basic block:");
+        log->Printf("Translating basic block %s:",
+                    BB.hasName() ? BB.getNameStr().c_str() : "[anonymous]");
     
         llvm::BasicBlock::iterator ii;