diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2472991..e69b29b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,8 @@ set(PDF2HTMLEX_VERSION "0.1")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wunused-function")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb")
 
 configure_file (src/config.h.in src/config.h)
 
diff --git a/src/HTMLRenderer/install.cc b/src/HTMLRenderer/install.cc
index fd5f684..739a78c 100644
--- a/src/HTMLRenderer/install.cc
+++ b/src/HTMLRenderer/install.cc
@@ -8,6 +8,7 @@
  */
 
 #include <iostream>
+#include <unordered_map>
 
 #include <boost/format.hpp>
 
@@ -16,6 +17,8 @@
 #include "HTMLRenderer.h"
 #include "namespace.h"
 
+using std::unordered_map;
+
 long long HTMLRenderer::install_font(GfxFont * font)
 {
     assert(sizeof(long long) == 2*sizeof(int));
@@ -125,7 +128,7 @@ void HTMLRenderer::install_embedded_font(GfxFont * font, const string & suffix,
 
     script_fout << format("Open(%1%, 1)") % (tmp_dir / (fn + suffix)) << endl;
 
-    unordered_map<int,int> gid2code;
+    unordered_map<int,int> gid2cid;
 
     auto ctu = font->getToUnicode();
     int * code2GID = nullptr;