diff --git a/tools/supported/liquids.cpp b/tools/supported/liquids.cpp
index 17e6d440f..0be65e031 100644
--- a/tools/supported/liquids.cpp
+++ b/tools/supported/liquids.cpp
@@ -166,7 +166,7 @@ int main (int argc, char** argv)
     {
         cerr << e.what() << endl;
         #ifndef LINUX_BUILD
-            cin.ignore();
+        cin.ignore();
         #endif
         return 1;
     }
@@ -184,6 +184,11 @@ int main (int argc, char** argv)
         string command = "";
         cout <<"[" << mode << ":" << brushname << ":" << amount << ":" << flowmode << ":" << setmode << "]# ";
         getline(cin, command);
+        if (std::cin.eof())
+        {
+            command = "q";
+            std::cout << std::endl; // No newline from the user here!
+        }
         if(command=="help" || command == "?")
         {
             cout << "Modes:" << endl
@@ -492,11 +497,11 @@ int main (int argc, char** argv)
     }
     DF->Detach();
     #ifndef LINUX_BUILD
-        if(!quiet)
-        {
-            cout << "Done. Press any key to continue" << endl;
-            cin.ignore();
-        }
+    if(!quiet)
+    {
+        cout << "Done. Press any key to continue" << endl;
+        cin.ignore();
+    }
     #endif
     return 0;
 }
diff --git a/tools/supported/prospector.cpp b/tools/supported/prospector.cpp
index 4ecb7201b..db53d5eba 100644
--- a/tools/supported/prospector.cpp
+++ b/tools/supported/prospector.cpp
@@ -278,7 +278,7 @@ int main(int argc, char *argv[])
                             veinMats[b->veinMaterialAt(coord)]++;
                             break;
                         case DFHack::FEATSTONE:
-                            if (blockFeatureLocal)
+                            if (blockFeatureLocal && des.bits.feature_local)
                             {
                                 if (blockFeatureLocal->type == DFHack::feature_Adamantine_Tube
                                         && blockFeatureLocal->main_material == 0) // stone
@@ -292,7 +292,7 @@ int main(int argc, char *argv[])
                                 }
                             }
 
-                            if (showSlade && blockFeatureGlobal
+                            if (showSlade && blockFeatureGlobal && des.bits.feature_global
                                     && blockFeatureGlobal->type == DFHack::feature_Underworld
                                     && blockFeatureGlobal->main_material == 0) // stone
                             {