diff --git a/h265.c b/h265.c
index 9b67759..a4c473e 100644
--- a/h265.c
+++ b/h265.c
@@ -406,7 +406,7 @@ int cFemonH265::parseSPS(const uint8_t *bufP, int lenP)
                 if (!bs.GetBit())                                    // scaling_list_pred_mode_flag[sizeId][matrixId]
                    bs.SkipUeGolomb();                                // scaling_list_pred_matrix_id_delta[sizeId][matrixId]
                 else {
-                   int coefNum = min(64, (1 << (4 + (sizeId << 1))));
+                   int coefNum = std::min(64, (1 << (4 + (sizeId << 1))));
                    if (sizeId > 1)
                       bs.SkipSeGolomb();                             // scaling_list_dc_coef_minus8[sizeId−2][matrixId]
                    for (int i = 0; i < coefNum; ++i)
diff --git a/osd.c b/osd.c
index a4890bf..0b1a78f 100644
--- a/osd.c
+++ b/osd.c
@@ -70,9 +70,9 @@
 #define OSDDRAWSTATUSBAR(value) \
         if (value > 0) { \
            int barvalue = OSDBARWIDTH(value); \
-           osdM->DrawRectangle(0, OSDSTATUSWIN_Y(offset) + 3, min(OSDBARWIDTH(FemonConfig.GetRedLimit()), barvalue), OSDSTATUSWIN_Y(offset) + OSDROWHEIGHT - 3, FemonTheme[FemonConfig.GetTheme()].clrRed); \
+           osdM->DrawRectangle(0, OSDSTATUSWIN_Y(offset) + 3, std::min(OSDBARWIDTH(FemonConfig.GetRedLimit()), barvalue), OSDSTATUSWIN_Y(offset) + OSDROWHEIGHT - 3, FemonTheme[FemonConfig.GetTheme()].clrRed); \
            if (barvalue > OSDBARWIDTH(FemonConfig.GetRedLimit())) \
-              osdM->DrawRectangle(OSDBARWIDTH(FemonConfig.GetRedLimit()), OSDSTATUSWIN_Y(offset) + 3, min((OSDWIDTH * FemonConfig.GetGreenLimit() / 100), barvalue), OSDSTATUSWIN_Y(offset) + OSDROWHEIGHT - 3, FemonTheme[FemonConfig.GetTheme()].clrYellow); \
+              osdM->DrawRectangle(OSDBARWIDTH(FemonConfig.GetRedLimit()), OSDSTATUSWIN_Y(offset) + 3, std::min((OSDWIDTH * FemonConfig.GetGreenLimit() / 100), barvalue), OSDSTATUSWIN_Y(offset) + OSDROWHEIGHT - 3, FemonTheme[FemonConfig.GetTheme()].clrYellow); \
            if (barvalue > OSDBARWIDTH(FemonConfig.GetGreenLimit())) \
               osdM->DrawRectangle(OSDBARWIDTH(FemonConfig.GetGreenLimit()), OSDSTATUSWIN_Y(offset) + 3, barvalue, OSDSTATUSWIN_Y(offset) + OSDROWHEIGHT - 3, FemonTheme[FemonConfig.GetTheme()].clrGreen); \
            }
@@ -705,7 +705,7 @@ void cFemonOsd::Action(void)
       }
     DrawInfoWindow();
     DrawStatusWindow();
-    sleepM.Wait(max((int)(100 * FemonConfig.GetUpdateInterval() - t.Elapsed()), 3));
+    sleepM.Wait(std::max((int)(100 * FemonConfig.GetUpdateInterval() - t.Elapsed()), 3));
     }
 }