diff --git a/handlers/animations.lua b/handlers/animations.lua
index 591a5fa..ea6c83c 100644
--- a/handlers/animations.lua
+++ b/handlers/animations.lua
@@ -24,8 +24,8 @@ function xdecor.sit(pos, node, clicker, pointed_thing)
 		default.player_attached[player_name] = false
 		default.player_set_animation(clicker, "stand", 30)
 
-	elseif not default.player_attached[player_name] and node.param2 <= 3 and not
-			ctrl.sneak and vector.equals(vel, {x=0,y=0,z=0}) then
+	elseif not default.player_attached[player_name] and node.param2 <= 3 and
+			not ctrl.sneak and vector.equals(vel, {x=0,y=0,z=0}) then
 
 		clicker:set_eye_offset({x=0, y=-7, z=2}, {x=0, y=0, z=0})
 		clicker:set_physics_override(0, 0, 0)
diff --git a/workbench.lua b/workbench.lua
index fee0bd9..67daacd 100644
--- a/workbench.lua
+++ b/workbench.lua
@@ -5,14 +5,19 @@ screwdriver = screwdriver or {}
 -- Only the regular, solid blocks without metas or explosivity can be cut.
 local nodes = {}
 for node, def in pairs(minetest.registered_nodes) do
-	if (def.drawtype == "normal" or def.drawtype:find("glass")) and
-	   (def.groups.cracky or def.groups.choppy) and not
-	   def.on_construct and not def.after_place_node and not
-	   def.after_place_node and not def.on_rightclick and not
-	   def.on_blast and not def.allow_metadata_inventory_take and not
-	   (def.groups.not_in_creative_inventory == 1) and not
-	   def.groups.wool and not def.description:find("Ore") and
-	   def.description and def.description ~= "" and def.light_source == 0
+	if (def.drawtype == "normal" or def.drawtype:sub(1,5) == "glass") and
+	   (def.groups.cracky or def.groups.choppy) and
+	   not def.on_construct and
+	   not def.after_place_node and
+	   not def.on_rightclick and
+	   not def.on_blast and
+	   not def.allow_metadata_inventory_take and
+	   not (def.groups.not_in_creative_inventory == 1) and
+	   not def.groups.wool and
+	   not def.description:find("Ore") and
+	   def.description and
+	   def.description ~= "" and
+	   def.light_source == 0
 	then
 		nodes[#nodes+1] = node
 	end