diff --git a/Makefile b/Makefile
index be1a4907..b127126d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ARCH ?= linux
 CFLAGS = -MMD -g -Wall -O2
-CXXFLAGS = -MMD -g -Wall -std=c++11 -O2 -ffast-math -fno-exceptions \
+CXXFLAGS = -MMD -g -Wall -std=c++11 -O3 -ffast-math -fno-exceptions \
 	-I./lib -I./include
 LDFLAGS =
 
@@ -15,7 +15,7 @@ CXX = g++
 SOURCES += lib/noc/noc_file_dialog.c
 CFLAGS += -DNOC_FILE_DIALOG_GTK $(shell pkg-config --cflags gtk+-2.0)
 CXXFLAGS += -DLINUX
-LDFLAGS += -lpthread -lGL -lGLEW -lglfw -ldl -ljansson -lportaudio -lportmidi \
+LDFLAGS += -rdynamic -lpthread -lGL -lGLEW -lglfw -ldl -ljansson -lportaudio -lportmidi \
 	$(shell pkg-config --libs gtk+-2.0)
 TARGET = Rack
 endif
diff --git a/include/widgets.hpp b/include/widgets.hpp
index db19e61f..177af686 100644
--- a/include/widgets.hpp
+++ b/include/widgets.hpp
@@ -3,7 +3,6 @@
 #include <assert.h>
 #include <stdio.h>
 #include <math.h>
-#include <vector>
 #include <list>
 #include <map>
 
diff --git a/src/gui.cpp b/src/gui.cpp
index b1ca5e62..d3cf587d 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -152,9 +152,8 @@ void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods
 
 void renderGui() {
 	int width, height;
-	// The docs say to use the framebuffer size to get pixel-perfect matching for high-DPI displays, but I actually don't want this. On 2x displays, one gui pixel should be 2x2 monitor pixels.
-	// glfwGetFramebufferSize(window, &width, &height);
-	glfwGetWindowSize(window, &width, &height);
+	glfwGetFramebufferSize(window, &width, &height);
+	// glfwGetWindowSize(window, &width, &height);
 
 	// Update and render
 	glViewport(0, 0, width, height);
diff --git a/src/main.cpp b/src/main.cpp
index 50cb7a7d..9914831a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -33,9 +33,9 @@ int main() {
 #endif
 
 
-	pluginInit();
 	rackInit();
 	guiInit();
+	pluginInit();
 	gRackWidget->loadPatch("autosave.json");
 
 	rackStart();