diff --git a/mapeditor.cpp b/mapeditor.cpp
index 55e3a11c..72ab6495 100644
--- a/mapeditor.cpp
+++ b/mapeditor.cpp
@@ -2387,6 +2387,9 @@ namespace mapeditor {
     
     dialog::addItem(XLAT("change the pattern/color of new Canvas cells"), 'c');
     dialog::add_action_push(patterns::showPrePatternNoninstant);
+
+    dialog::addItem(XLAT("configure WFC"), 'W');
+    dialog::add_action_push(wfc::wfc_menu);
     
     dialog::addBack();
     dialog::display();
diff --git a/system.cpp b/system.cpp
index 00516d12..683bd6e2 100644
--- a/system.cpp
+++ b/system.cpp
@@ -345,6 +345,7 @@ EX void initgame() {
     savecount = 0; savetime = 0;
     cheater = 0;
     if(autocheat) cheater = 1;
+    if(!wfc::use_eclectic) cheater = 1;
     hauntedWarning = false;
     if(!autocheat) {
       timerghost = true;