diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39a7c470..315ef838 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,10 @@ set(CMAKE_CXX_STANDARD 14)
 include_directories("." "Console" "McZapkie")
 file(GLOB HEADERS "*.h" "Console/*.h" "McZapkie/*.h")
 
+if (APPLE)
+	set (CMAKE_EXE_LINKER_FLAGS "-pagezero_size 10000 -image_base 100000000")
+endif()
+
 option(USE_IMGUI_GL3 "Use OpenGL3+ imgui implementation" OFF)
 option(WITH_UART "Compile with libserialport" OFF)
 
diff --git a/EU07.cpp b/EU07.cpp
index a5a9f2f3..b69cc2e2 100644
--- a/EU07.cpp
+++ b/EU07.cpp
@@ -34,9 +34,9 @@ int main( int argc, char *argv[] )
         auto result { Application.init( argc, argv ) };
         if( result == 0 ) {
             result = Application.run();
+	    Application.exit();
         }
-        Application.exit();
-		std::_Exit(0); // skip destructors, there are ordering errors which causes segfaults
+	std::_Exit(0); // skip destructors, there are ordering errors which causes segfaults
         return result;
     }
     catch( std::bad_alloc const &Error )
diff --git a/stdafx.h b/stdafx.h
index 06095c1f..8b968ab0 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -6,6 +6,12 @@
 #ifndef STDAFX_H
 #define STDAFX_H
 
+#ifdef __APPLE__
+#ifndef __unix__
+#define __unix__ 1
+#endif
+#endif
+
 #define _USE_MATH_DEFINES
 #include <cmath>
 #ifdef _MSC_VER