diff --git a/lib-src/libmp3lame/VbrTag.c b/lib-src/libmp3lame/VbrTag.c
index 5800a44cc..832cba22e 100644
--- a/lib-src/libmp3lame/VbrTag.c
+++ b/lib-src/libmp3lame/VbrTag.c
@@ -251,7 +251,7 @@ IsVbrTag(const unsigned char *buf)
     return (isTag0 || isTag1);
 }
 
-#define SHIFT_IN_BITS_VALUE(x,n,v) ( x = (x << (n)) | ( (v) & ~(-1 << (n)) ) )
+#define SHIFT_IN_BITS_VALUE(x,n,v) ( x = (x << (n)) | ( (v) & ~(-1u << (n)) ) )
 
 static void
 setLameTagFrameHeader(lame_internal_flags const *gfc, unsigned char *buffer)
@@ -427,7 +427,7 @@ GetVbrTag(VBRTAGDATA * pTagData, const unsigned char *buf)
     }
 
     if (head_flags & TOC_FLAG) {
-        if (pTagData->toc != NULL) {
+        if ((void *)pTagData->toc != NULL) {
             for (i = 0; i < NUMTOCENTRIES; i++)
                 pTagData->toc[i] = buf[i];
         }
diff --git a/lib-src/libmp3lame/lame.c b/lib-src/libmp3lame/lame.c
index cb82225a8..8e28d370c 100644
--- a/lib-src/libmp3lame/lame.c
+++ b/lib-src/libmp3lame/lame.c
@@ -638,7 +638,7 @@ lame_init_params(lame_global_flags * gfp)
 
     if (cfg->vbr == vbr_off && gfp->brate == 0) {
         /* no bitrate or compression ratio specified, use 11.025 */
-        if (EQ(gfp->compression_ratio, 0))
+        if (EQ(gfp->compression_ratio, 0.0))
             gfp->compression_ratio = 11.025; /* rate to compress a CD down to exactly 128000 bps */
     }
 
@@ -1603,7 +1603,7 @@ save_gain_values(lame_internal_flags * gfc)
     /* save the ReplayGain value */
     if (cfg->findReplayGain) {
         FLOAT const RadioGain = (FLOAT) GetTitleGain(rsv->rgdata);
-        if (NEQ(RadioGain, GAIN_NOT_ENOUGH_SAMPLES)) {
+        if (NEQ(RadioGain, (float)GAIN_NOT_ENOUGH_SAMPLES)) {
             rov->RadioGain = (int) floor(RadioGain * 10.0 + 0.5); /* round to nearest */
         }
         else {
diff --git a/lib-src/libmp3lame/presets.c b/lib-src/libmp3lame/presets.c
index 93594f5b2..ebfeafb00 100644
--- a/lib-src/libmp3lame/presets.c
+++ b/lib-src/libmp3lame/presets.c
@@ -167,8 +167,8 @@ apply_vbr_preset(lame_global_flags * gfp, int a, int enforce)
     LERP(ath_fixpoint);
 
     (void) lame_set_VBR_q(gfp, set->vbr_q);
-    SET_OPTION(quant_comp, set->quant_comp, -1);
-    SET_OPTION(quant_comp_short, set->quant_comp_s, -1);
+    SET_OPTION(quant_comp, set->quant_comp, -1.0);
+    SET_OPTION(quant_comp_short, set->quant_comp_s, -1.0);
     if (set->expY) {
         (void) lame_set_experimentalY(gfp, set->expY);
     }
@@ -281,8 +281,8 @@ apply_abr_preset(lame_global_flags * gfp, int preset, int enforce)
         (void) lame_set_sfscale(gfp, 1);
 
 
-    SET_OPTION(quant_comp, abr_switch_map[r].quant_comp, -1);
-    SET_OPTION(quant_comp_short, abr_switch_map[r].quant_comp_s, -1);
+    SET_OPTION(quant_comp, abr_switch_map[r].quant_comp, -1.0);
+    SET_OPTION(quant_comp_short, abr_switch_map[r].quant_comp_s, -1.0);
 
     SET__OPTION(msfix, abr_switch_map[r].nsmsfix, -1);
 
diff --git a/lib-src/libmp3lame/set_get.c b/lib-src/libmp3lame/set_get.c
index f7639005c..eeb73a647 100644
--- a/lib-src/libmp3lame/set_get.c
+++ b/lib-src/libmp3lame/set_get.c
@@ -1723,7 +1723,7 @@ float
 lame_get_interChRatio(const lame_global_flags * gfp)
 {
     if (is_lame_global_flags_valid(gfp)) {
-        assert((0 <= gfp->interChRatio && gfp->interChRatio <= 1.0) || EQ(gfp->interChRatio, -1));
+        assert((0 <= gfp->interChRatio && gfp->interChRatio <= 1.0) || EQ(gfp->interChRatio, -1.0));
         return gfp->interChRatio;
     }
     return 0;