diff --git a/AppKit/CPFont.j b/AppKit/CPFont.j
index 9ded9499f..7cf8d38aa 100644
--- a/AppKit/CPFont.j
+++ b/AppKit/CPFont.j
@@ -311,6 +311,7 @@ var CPFontNameKey     = @"CPFontNameKey",
         isBold = [aCoder decodeBoolForKey:CPFontIsBoldKey],
         isItalic = [aCoder decodeBoolForKey:CPFontIsItalicKey];
 
+    // Substitute configured font for legacy font
     if (fontName === _CPFontDefaultSystemFontFace && _CPFontDefaultSystemFontFace !== _CPFontSystemFontFace)
     {
         fontName = _CPFontSystemFontFace;
diff --git a/Tools/nib2cib/main.j b/Tools/nib2cib/main.j
index ca179cb0d..c997c169d 100644
--- a/Tools/nib2cib/main.j
+++ b/Tools/nib2cib/main.j
@@ -54,7 +54,7 @@ parser.option("--mac", "format")
     .def(NibFormatUndetermined)
     .help("Set format to Mac");
 
-parser.option("--legacy", "conversionMode")
+parser.option("--legacy", "layoutMode")
     .set(ConverterModeLegacy)
     .def(ConverterModeNew)
     .help("Use legacy code that does not preserve view positioning/sizing");