diff --git a/plugins/dig.cpp b/plugins/dig.cpp
index 148da5482..d18176f5a 100644
--- a/plugins/dig.cpp
+++ b/plugins/dig.cpp
@@ -1522,6 +1522,8 @@ command_result digtype (color_ostream &out, vector <string> & parameters)
                 tt = mCache->tiletypeAt(current);
                 if (!DFHack::isWallTerrain(tt))
                     continue;
+                if (tileMaterial(tt) != df::enums::tiletype_material::MINERAL)
+                    continue;
 
                 //designate it for digging
                 df::tile_designation des = mCache->designationAt(current);
diff --git a/plugins/labormanager/labormanager.cpp b/plugins/labormanager/labormanager.cpp
index 5d6c5c971..3ef1808a2 100644
--- a/plugins/labormanager/labormanager.cpp
+++ b/plugins/labormanager/labormanager.cpp
@@ -1075,8 +1075,7 @@ private:
                     if (bl->designation[x][y].bits.hidden)
                     {
                         df::coord p = bl->map_pos;
-                        df::coord c(p.x, p.y, p.z - 1);
-                        if (Maps::getTileDesignation(c)->bits.hidden)
+                        if (! Maps::isTileVisible(p.x, p.y, p.z-1))
                             continue;
                     }