diff --git a/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java b/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java
index 9a8e70c4d..45eb9fd94 100644
--- a/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java
+++ b/src/main/java/dan200/computercraft/shared/integration/crafttweaker/actions/AddTurtleTool.java
@@ -106,7 +106,10 @@ public class AddTurtleTool implements IUndoableAction
 
         if( craftItem.isEmpty() ) trackLog.error( "Crafting item stack is empty." );
 
-        if( craftItem.hasTag() && !craftItem.getTag().isEmpty() ) trackLog.warning( "Crafting item has NBT." );
+        if( craftItem.isDamaged() || craftItem.isEnchanted() || craftItem.hasCustomHoverName() )
+        {
+            trackLog.warning( "Crafting item has NBT." );
+        }
         if( toolItem.isEmpty() ) trackLog.error( "Tool item stack is empty." );
 
         if( !kinds.containsKey( kind ) ) trackLog.error( String.format( "Unknown kind '%s'.", kind ) );
@@ -122,6 +125,6 @@ public class AddTurtleTool implements IUndoableAction
     @Override
     public boolean shouldApplyOn( LogicalSide side )
     {
-        return true;
+        return shouldApplySingletons();
     }
 }