diff --git a/rbutil/mkamsboot/dualboot.S b/rbutil/mkamsboot/dualboot.S
index 471158e9a8..c8d2dd7d9f 100644
--- a/rbutil/mkamsboot/dualboot.S
+++ b/rbutil/mkamsboot/dualboot.S
@@ -44,7 +44,7 @@ start:
 uclcopy:
         ldrb  r4, [r0], #-1
         strb  r4, [r3], #-1
-        cmp   r2, r3
+        cmp   r2, r0
         bne   uclcopy
 
         add   r5, r2, #2            /* r5 is entry point of copy of uclunpack */
diff --git a/rbutil/mkamsboot/mkamsboot.c b/rbutil/mkamsboot/mkamsboot.c
index 7e72d6cc3c..67f9850584 100644
--- a/rbutil/mkamsboot/mkamsboot.c
+++ b/rbutil/mkamsboot/mkamsboot.c
@@ -471,6 +471,10 @@ int main(int argc, char* argv[])
 
     close(fdout);
 
+    fprintf(stderr," *****************************************************************************\n");
+    fprintf(stderr," *** THIS CODE IS UNTESTED - DO NOT USE IF YOU CAN NOT RECOVER YOUR DEVICE ***\n");
+    fprintf(stderr," *****************************************************************************\n");
+
     return 0;
 
 }