--- src/lv2gui.cpp~	2016-02-25 09:26:58.000000000 -0500
+++ src/lv2gui.cpp	2016-02-25 09:28:07.539849026 -0500
@@ -582,7 +582,7 @@
 {
     const plugin_metadata_iface *plugin_metadata = plugin_registry::instance().get_by_uri(plugin_uri);
     if (!plugin_metadata)
-        return false;
+        return NULL;
     
     ext_plugin_gui *ui = new ext_plugin_gui(plugin_metadata, write_function, controller, features);
     if (!ui->initialise())
--- src/modules.cpp~	2016-02-25 10:40:31.000000000 -0500
+++ src/modules.cpp	2016-02-25 10:42:27.724163518 -0500
@@ -1426,8 +1426,7 @@
                                 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(_param_mode == 3 or _param_mode == 4) {
                                     // do the same with R channel if needed
                                     lastoutR = fft_outR[_iter];
--- src/modules.cpp~	2016-02-25 10:47:17.000000000 -0500
+++ src/modules.cpp	2016-02-25 10:51:29.015227118 -0500
@@ -1430,8 +1430,7 @@
                                 if(_param_mode == 3 or _param_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~	2012-09-21 14:07:24.000000000 -0400
+++ src/modules_limit.cpp	2016-02-25 10:59:27.709802946 -0500
@@ -544,7 +544,7 @@
             } // process single strip with filter
 
             // write multiband coefficient to buffer
-            buffer[pos] = std::min(*params[param_limit] / std::max(fabs(sum_left), fabs(sum_right)), 1.0);
+            buffer[pos] = *params[param_limit] / std::max(fabs(sum_left), fabs(sum_right)) < 1.0 ? *params[param_limit] / std::max(fabs(sum_left), fabs(sum_right)) : 1.0;
 
             for (int i = 0; i < strips; i++) {
                 // process gain reduction
--- src/jack_client.cpp~	2012-07-23 05:37:48.000000000 -0400
+++ src/jack_client.cpp	2016-02-25 11:30:45.952132689 -0500
@@ -163,7 +163,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>(int(p->second), i));
                 }
             }
             jack_free(conns);