diff --git a/client/src/cmdlfem410x.c b/client/src/cmdlfem410x.c
index c22e3954d..171a14432 100644
--- a/client/src/cmdlfem410x.c
+++ b/client/src/cmdlfem410x.c
@@ -710,6 +710,11 @@ static int CmdEM410xClone(const char *Cmd) {
         return PM3_EINVARG;
     }
 
+    if (hs && IfPm3Hitag() == false) {
+        PrintAndLogEx(FAILED, "Device not compiled to support Hitag");
+        return PM3_EINVARG;
+    }
+
     // Allowed clock rates: 16, 32, 40 and 64
     if ((clk != 16) && (clk != 32) && (clk != 64) && (clk != 40)) {
         PrintAndLogEx(FAILED, "supported clock rates are " _YELLOW_("16, 32, 40, 64") "  got " _RED_("%d") "\n", clk);
diff --git a/client/src/cmdlfem4x05.c b/client/src/cmdlfem4x05.c
index b70eaf75a..2a1fcf387 100644
--- a/client/src/cmdlfem4x05.c
+++ b/client/src/cmdlfem4x05.c
@@ -941,7 +941,7 @@ static void em4x05_print_blocks(em_tech_type_t cardtype, uint8_t *data, uint8_t
         return;
     }
 
-    uint32_t *d = (uint32_t *)data;
+    uint32_t *d = (void *)data;
 
     uint8_t i;
     for (i = 0; i < (dlen >> 2); i++) {