diff --git a/Makefile b/Makefile
index 1d429d3a..66c720eb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 VERSION = 0.6.0dev
+RACK_DIR = .
 
 FLAGS += \
 	-Iinclude \
diff --git a/compile.mk b/compile.mk
index 307c6fe7..358a60f5 100644
--- a/compile.mk
+++ b/compile.mk
@@ -1,6 +1,7 @@
 ifdef VERSION
 	FLAGS += -DVERSION=$(VERSION)
 endif
+RACK_DIR ?= .
 
 # Generate dependency files alongside the object files
 FLAGS += -MMD
@@ -14,6 +15,8 @@ endif
 CXXFLAGS += -std=c++11
 
 
+include $(RACK_DIR)/arch.mk
+
 ifeq ($(ARCH), lin)
 	FLAGS += -DARCH_LIN
 endif
diff --git a/src/window.cpp b/src/window.cpp
index cc0d69ea..1978ef89 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -461,7 +461,7 @@ void windowRun() {
 		glfwGetWindowSize(gWindow, &windowWidth, &windowHeight);
 		gWindowRatio = (float)width / windowWidth;
 
-		gScene->box.size = Vec(width, height).div(gPixelRatio / gWindowRatio);
+		gScene->box.size = Vec(windowWidth, windowHeight);
 
 		// Step scene
 		gScene->step();