diff --git a/src/mode/cam/client.js b/src/mode/cam/client.js
index 7a3ee000..c67bf3dd 100644
--- a/src/mode/cam/client.js
+++ b/src/mode/cam/client.js
@@ -942,7 +942,7 @@
                 for (let [key, val] of Object.entries(op.inputs)) {
                     let type = val.type;
                     let from = map[key];
-                    if (!rec[key] && type && from) {
+                    if (rec[key] === undefined && type && from) {
                         let newval = current.process[from];
                         rec[key] = current.process[from];
                     }
diff --git a/src/mode/cam/ops.js b/src/mode/cam/ops.js
index efd0441b..89a9478d 100644
--- a/src/mode/cam/ops.js
+++ b/src/mode/cam/ops.js
@@ -980,7 +980,7 @@
                         });
                         poly.points.pop();
                         poly.length--;
-                        slice.camTrace = { tool, rate: op.feed, plunge: op.rate };
+                        slice.camTrace = { tool: tool.getID(), rate: op.feed, plunge: op.rate };
                         slice.camLines = [ poly ];
                         slice.output()
                             .setLayer("register", {line: 0xaa00aa}, false)
@@ -1011,7 +1011,7 @@
             let { setTool, setSpindle, setDrill, emitDrills } = ops;
 
             if (op.axis === '-') {
-                setTool(op.tool, undefined, op.rate);
+                setTool(op.tool, op.feed, op.rate);
                 setSpindle(op.spindle);
                 for (let slice of this.sliceOut) {
                     ops.emitTrace(slice);