--- src/jack_client.cpp~	2015-03-29 09:23:32.000000000 -0400
+++ src/jack_client.cpp	2016-04-24 15:13:35.048501487 -0400
@@ -226,7 +226,7 @@
                 map<string, int>::const_iterator p = port_to_plugin.find((*k) + cnlen + 1);
                 if (p != port_to_plugin.end())
                 {
-                    run_before.insert(make_pair<int, int>(p->second, i));
+                    run_before.insert(make_pair<int, int>(static_cast<int>(p->second), i));
                 }
             }
             jack_free(conns);
--- src/analyzer.cpp~	2015-03-29 09:23:32.000000000 -0400
+++ src/analyzer.cpp	2016-04-24 15:19:04.783048796 -0400
@@ -470,13 +470,12 @@
                                 lastoutL = fft_outL[_iter];
                                 //pumping up actual signal an erase surrounding
                                 // sounds
-                                fft_outL[_iter] = 0.25f * std::max(n * 0.6f * \
-                                    fabs(fft_outL[_iter]) - var1L , 1e-20);
+                                fft_outL[_iter] = (0.25f * (n * 0.6f * fabs(fft_outL[_iter]) - var1L > 1e-20) ? (n * 0.6f * fabs(fft_outL[_iter]) - var1L) : 1e-20);
+
                                 if(_mode == 3 or _mode == 4) {
                                     // do the same with R channel if needed
                                     lastoutR = fft_outR[_iter];
-                                    fft_outR[_iter] = 0.25f * std::max(n * \
-                                        0.6f * fabs(fft_outR[_iter]) - var1R , 1e-20);
+                                    fft_outR[_iter] = (0.25f * (n * 0.6f * fabs(fft_outR[_iter]) - var1R > 1e-20) ? (n * 0.6f * fabs(fft_outR[_iter]) - var1R) : 1e-20);
                                 }
                                 break;
                         }
--- src/modules_limit.cpp~	2015-03-29 09:23:32.000000000 -0400
+++ src/modules_limit.cpp	2016-04-24 15:25:01.046492068 -0400
@@ -429,7 +429,8 @@
                 }
                 
                 // write multiband coefficient to buffer
-                buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0);
+                buffer[pos] = *params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)) < 1.0 ? *params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)) : 1.0;
+
                 
                 // step forward in multiband buffer
                 pos = (pos + channels) % buffer_size;
@@ -811,7 +812,7 @@
                 }
                 
                 // write multiband coefficient to buffer
-                buffer[pos] = std::min(*params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)), 1.0);
+                buffer[pos] = *params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)) < 1.0 ? *params[param_limit] / std::max(fabs(tmpL), fabs(tmpR)) : 1.0;
                 
                 // step forward in multiband buffer
                 pos = (pos + channels) % buffer_size;
--- src/modules_dist.cpp~	2015-03-29 09:23:32.000000000 -0400
+++ src/modules_dist.cpp	2016-04-24 15:32:00.617341574 -0400
@@ -794,8 +794,8 @@
             lfo2.advance(1);
             
             // dot
-            rms = std::max((double)rms, (fabs(Lo) + fabs(Ro)) / 2);
-            input = std::max((double)input, (fabs(Lc) + fabs(Rc)) / 2);
+            rms = (double)rms > (fabs(Lo) + fabs(Ro)) / 2 ? (double)rms : (fabs(Lo) + fabs(Ro)) / 2;
+            input = (double)input > (fabs(Lc) + fabs(Rc)) / 2 ? (double)input : (fabs(Lc) + fabs(Rc)) / 2;
             
             float values[] = {inL, inR, outs[0][i], outs[1][i]};
             meters.process(values);