diff --git a/src/sfizz/Defaults.h b/src/sfizz/Defaults.h
index 8e25ec5e..65e7215f 100644
--- a/src/sfizz/Defaults.h
+++ b/src/sfizz/Defaults.h
@@ -87,13 +87,13 @@ struct OpcodeSpec
         if (!(flags & needsOperation))
             return input;
         else if (flags & kNormalizePercent)
-            return normalizePercents(input);
+            return static_cast<U>(normalizePercents(input));
         else if (flags & kNormalizeMidi)
-            return normalize7Bits(input);
+            return static_cast<U>(normalize7Bits(input));
         else if (flags & kNormalizeBend)
-            return normalizeBend(input);
+            return static_cast<U>(normalizeBend(input));
         else if (flags & kDb2Mag)
-            return db2mag(input);
+            return static_cast<U>(db2mag(input));
         else // just in case
             return input;
     }
diff --git a/src/sfizz/Region.h b/src/sfizz/Region.h
index c0ea5968..4b3ee6c2 100644
--- a/src/sfizz/Region.h
+++ b/src/sfizz/Region.h
@@ -383,10 +383,10 @@ struct Region {
 
     // Performance parameters: amplifier
     float volume { Default::volume }; // volume
-    float amplitude { normalizePercents(Default::amplitude) }; // amplitude
-    float pan { normalizePercents(Default::pan) }; // pan
-    float width { normalizePercents(Default::width) }; // width
-    float position { normalizePercents(Default::position) }; // position
+    float amplitude { Default::amplitude }; // amplitude
+    float pan { Default::pan }; // pan
+    float width { Default::width }; // width
+    float position { Default::position }; // position
     uint8_t ampKeycenter { Default::key }; // amp_keycenter
     float ampKeytrack { Default::ampKeytrack }; // amp_keytrack
     float ampVeltrack { Default::ampVeltrack }; // amp_veltrack
diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp
index fefa48d4..58c04f4d 100644
--- a/src/sfizz/Synth.cpp
+++ b/src/sfizz/Synth.cpp
@@ -360,7 +360,7 @@ void Synth::Impl::handleControlOpcodes(const std::vector<Opcode>& members)
             }
             break;
         case hash("label_cc&"):
-            if (Default::ccNumberRange.containsWithEnd(member.parameters.back()))
+            if (Default::ccNumber.bounds.containsWithEnd(member.parameters.back()))
                 setCCLabel(member.parameters.back(), std::string(member.value));
             break;
         case hash("label_key&"):