diff --git a/run_time/src/gae_server/www/js/tachyfont/incrementalfont.js b/run_time/src/gae_server/www/js/tachyfont/incrementalfont.js
index 693675d9..e4250d2c 100644
--- a/run_time/src/gae_server/www/js/tachyfont/incrementalfont.js
+++ b/run_time/src/gae_server/www/js/tachyfont/incrementalfont.js
@@ -258,7 +258,7 @@ tachyfont.IncrementalFont.obj_ = function(fontInfo, params, backendService) {
   /**
    * The character to format 4 / format 12 mapping.
    *
-   * @private {Object.<string, !tachyfont.CharCmapInfo>}
+   * @private {Object.<number, !tachyfont.CharCmapInfo>}
    */
   this.cmapMapping_;
 
@@ -505,8 +505,8 @@ tachyfont.IncrementalFont.obj_.prototype.writeCmap4 = function(baseFontView) {
  * Inject glyphs in the glyphData to the baseFontView
  * @param {DataView} baseFontView Current base font
  * @param {tachyfont.GlyphBundleResponse} bundleResponse New glyph data
- * @param {Object.<number, !number>} glyphToCodeMap  The glyph Id to code point
- *     mapping;
+ * @param {Object.<number, Array.<!number>>} glyphToCodeMap  The glyph Id to
+ *     code point mapping;
  * @return {DataView} Updated base font
  */
 tachyfont.IncrementalFont.obj_.prototype.injectCharacters =
diff --git a/run_time/src/gae_server/www/js/tachyfont/incrementalfontutils.js b/run_time/src/gae_server/www/js/tachyfont/incrementalfontutils.js
index c0d2fffa..be52977a 100644
--- a/run_time/src/gae_server/www/js/tachyfont/incrementalfontutils.js
+++ b/run_time/src/gae_server/www/js/tachyfont/incrementalfontutils.js
@@ -323,7 +323,7 @@ tachyfont.IncrementalFontUtils.setCssFontRule =
 /**
  * Get the character to glyphId mapping.
  * @param {Object} headerInfo Header information.
- * @return {Object.<string, tachyfont.CharCmapInfo>} Map of chars to glyphId,
+ * @return {Object.<number, tachyfont.CharCmapInfo>} Map of chars to glyphId,
  *     format4Seg, format12Seg.
  */
 tachyfont.IncrementalFontUtils.getCmapMapping = function(headerInfo) {
@@ -368,7 +368,7 @@ tachyfont.IncrementalFontUtils.getCmapMapping = function(headerInfo) {
 
 
   if (!headerInfo.compact_gos.cmap12) {
-    if (goog.Debug) {
+    if (goog.DEBUG) {
       debugger; // TODO(bstell): need to handle this.
     }
     return cmapMapping;