2 files changed, 7 insertions, 6 deletions

diff --git a/src/core/moves.h b/src/core/moves.h
index c162c1d..9f1f7cc 100644
--- a/src/core/moves.h
+++ b/src/core/moves.h
@@ -623,10 +623,10 @@ move_variations_lastqt(
         size_t u;
         moves_struct_t ss;
 
-        in1 = s->nnormal-1;
-        in2 = s->nnormal-2;
-        ii1 = s->ninverse-1;
-        ii2 = s->ninverse-2;
+        in1 = (uint8_t)(s->nnormal-1);
+        in2 = (uint8_t)(s->nnormal-2);
+        ii1 = (uint8_t)(s->ninverse-1);
+        ii2 = (uint8_t)(s->ninverse-2);
 
         n1 = in1 >= 0 ? s->normal[in1] : UINT8_ERROR;
         n2 = in2 >= 0 ? s->normal[in2] : UINT8_ERROR;
diff --git a/src/core/transform.h b/src/core/transform.h
index 206449b..af4634e 100644
--- a/src/core/transform.h
+++ b/src/core/transform.h
@@ -407,12 +407,13 @@ inverse_trans(uint8_t t)
 STATIC uint64_t
 symmetry_mask(cube_t cube)
 {
-        uint64_t t, ret;
+        uint64_t ret;
+        uint8_t t;
         cube_t transformed;
 
         for (t = 0, ret = 0; t < NTRANS; t++) {
                 transformed = transform(cube, t);
-                ret |= ((uint64_t)equal(cube, transformed)) << t;
+                ret |= ((uint64_t)equal(cube, transformed)) << (uint64_t)t;
         }
 
         return ret;