diff --git a/Makefile b/Makefile
index dda8d7c..b4c01c2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 INCDIRS = -Iinclude
-CXX = skm g++ $(INCDIRS)
+CXX = skm g++ $(INCDIRS) -Ofast
 src = $(wildcard src/*.cpp)
 obj = $(src:.cpp=.o)
 
@@ -14,11 +14,9 @@ else
     endif
 endif
 
-OSFLAGS = -O3
-
 ArcadeMachine: $(obj)
 	-.scripts/generate-stats.sh
-	$(CXX) -o $@ $^ $(LDFLAGS) $(OSFLAGS)
+	$(CXX) -o $@ $^ $(LDFLAGS) 
 
 clean:
 	rm $(obj)
diff --git a/include/Configuration.h b/include/Configuration.h
index 537c24f..cf88b7b 100644
--- a/include/Configuration.h
+++ b/include/Configuration.h
@@ -11,7 +11,7 @@
 #define ARCADE_MACHINE_PATH_SEP "/"
 #endif
 
-#ifdef __arm__
+#if defined(__arm__) || defined(__aarch64__)
 #define ARCADE_MACHINE_INSTRUCTION_SET "arm"
 #else
 #define ARCADE_MACHINE_INSTRUCTION_SET "x86"