diff --git a/lib8tion.h b/lib8tion.h
index 84e3705..deecf40 100644
--- a/lib8tion.h
+++ b/lib8tion.h
@@ -839,9 +839,9 @@ public:
   uint16_t operator*(uint16_t v) { return (v*i) + ((v*f)>>F); }
   int32_t operator*(int32_t v) { return (v*i) + ((v*f)>>F); }
   int16_t operator*(int16_t v) { return (v*i) + ((v*f)>>F); }
-#ifdef FASTLED_ARM
+//#ifdef FASTLED_ARM
   int operator*(int v) { return (v*i) + ((v*f)>>F); }
-#endif
+//#endif
 #ifdef FASTLED_APOLLO3
   int operator*(int v) { return (v*i) + ((v*f)>>F); }
 #endif
diff --git a/noise.cpp b/noise.cpp
index 7d42d64..93057bc 100644
--- a/noise.cpp
+++ b/noise.cpp
@@ -628,7 +628,7 @@ void fill_raw_2dnoise8(uint8_t *pData, int width, int height, uint8_t octaves, u
 
 void fill_raw_2dnoise16(uint16_t *pData, int width, int height, uint8_t octaves, q88 freq88, fract16 amplitude, int skip, uint32_t x, int scalex, uint32_t y, int scaley, uint32_t time) {
   if(octaves > 1) {
-    fill_raw_2dnoise16(pData, width, height, octaves-1, freq88, amplitude, skip, x *freq88 , scalex *freq88, y * freq88, scaley * freq88, time);
+    fill_raw_2dnoise16(pData, width, height, octaves-1, freq88, amplitude, skip, freq88 * x , freq88 * scalex, freq88 * y, freq88 * scaley, time);
   } else {
     // amplitude is always 255 on the lowest level
     amplitude=65535;
@@ -662,7 +662,7 @@ int32_t nmax=0;
 
 void fill_raw_2dnoise16into8(uint8_t *pData, int width, int height, uint8_t octaves, q44 freq44, fract8 amplitude, int skip, uint32_t x, int scalex, uint32_t y, int scaley, uint32_t time) {
   if(octaves > 1) {
-    fill_raw_2dnoise16into8(pData, width, height, octaves-1, freq44, amplitude, skip+1, x*freq44, scalex *freq44, y*freq44, scaley * freq44, time);
+    fill_raw_2dnoise16into8(pData, width, height, octaves-1, freq44, amplitude, skip+1, x*freq44, freq44 * scalex, freq44 * y, freq44 * scaley, time);
   } else {
     // amplitude is always 255 on the lowest level
     amplitude=255;