diff --git a/source/org/thdl/tib/input/ConverterGUI.java b/source/org/thdl/tib/input/ConverterGUI.java
index d85c474..73d8a02 100644
--- a/source/org/thdl/tib/input/ConverterGUI.java
+++ b/source/org/thdl/tib/input/ConverterGUI.java
@@ -37,7 +37,7 @@ public class ConverterGUI implements FontConversion, FontConverterConstants {
 	public static void main(String[] args) {
         // No need for the TM or TMW fonts.
         System.setProperty("thdl.rely.on.system.tmw.fonts", "true");
-        System.setProperty("thdl.do.not.rely.on.system.tmw.fonts", "false");
+        System.setProperty("thdl.do.not.rely.on.system.tm.fonts", "false");
 
         System.exit(realMain(args, System.out, null));
     }
diff --git a/source/org/thdl/tib/input/DuffPaneTest.java b/source/org/thdl/tib/input/DuffPaneTest.java
index 367d36d..a2e0fbd 100644
--- a/source/org/thdl/tib/input/DuffPaneTest.java
+++ b/source/org/thdl/tib/input/DuffPaneTest.java
@@ -40,8 +40,9 @@ public class DuffPaneTest extends TestCase {
         // We don't want to use options.txt:
         ThdlOptions.forTestingOnlyInitializeWithoutDefaultOptionsFile();
 
-        // We don't want to load the TMW font files ourselves:
+        // We don't want to load the TM or TMW font files ourselves:
         ThdlOptions.setUserPreference("thdl.rely.on.system.tmw.fonts", true);
+        ThdlOptions.setUserPreference("thdl.do.not.rely.on.system.tm.fonts", false);
         ThdlOptions.setUserPreference("thdl.debug", true);
 
         dp = new DuffPane();
@@ -87,10 +88,10 @@ public class DuffPaneTest extends TestCase {
     private void ensureKeysGiveCorrectWylie(String keys, String wylie) {
         dp.newDocument(); // initialize to a blank canvas.
         fireKeysWithoutModifiers(keys);
-        boolean passes = wylie.equals(dp.getWylie());
+        boolean passes = wylie.equals(dp.getWylie(new boolean[] { false }));
         if (!passes) {
             System.out.println("Congrats! These keys, \"" + keys
-                               + "\", give this wylie, \"" + dp.getWylie()
+                               + "\", give this wylie, \"" + dp.getWylie(new boolean[] { false })
                                + "\", not the expected \"" + wylie + "\"");
         }
         assertTrue(passes);
diff --git a/source/org/thdl/tib/input/TibetanConverter.java b/source/org/thdl/tib/input/TibetanConverter.java
index 9c54a2a..622bb14 100644
--- a/source/org/thdl/tib/input/TibetanConverter.java
+++ b/source/org/thdl/tib/input/TibetanConverter.java
@@ -47,7 +47,7 @@ public class TibetanConverter implements FontConverterConstants {
     static {
         // No need for the TM or TMW fonts.
         System.setProperty("thdl.rely.on.system.tmw.fonts", "true");
-        System.setProperty("thdl.do.not.rely.on.system.tmw.fonts", "false");
+        System.setProperty("thdl.do.not.rely.on.system.tm.fonts", "false");
     }
 
     /**