diff --git a/data/macos/build-deps.sh b/data/macos/build-deps.sh
index fe8bc5f1b..6879c65e8 100755
--- a/data/macos/build-deps.sh
+++ b/data/macos/build-deps.sh
@@ -569,8 +569,6 @@ fi
 
 if [ ! -f PyQt-gpl-5.5.1/build-done ]; then
 cd PyQt-gpl-5.5.1
-# sed -i -e "s/# Read the details./pylib_dir = ''/" configure.py
-# sed -i -e "s/qmake_QT=['webkitwidgets']/qmake_QT=['webkitwidgets', 'printsupport']/" configure.py
 python3 configure.py --confirm-license -c
 make
 make install
diff --git a/data/macos/env.sh b/data/macos/env.sh
index 67b493c12..9955dc206 100644
--- a/data/macos/env.sh
+++ b/data/macos/env.sh
@@ -3,17 +3,19 @@
 ##############################################################################################
 # MacOS X default environment for Carla
 
+TARGETDIR=$HOME/builds
+
 export MACOS="true"
 export CC=clang
 export CXX=clang++
 
-export CFLAGS=-m64
-export CXXFLAGS=-m64
-export LDLAGS=-m64
+export CFLAGS="-O3 -m64"
+export CXXFLAGS=$CFLAGS
+export LDFLAGS="-m64"
 unset CPPFLAGS
 
-export PATH=$HOME/Builds/carla/bin:$HOME/Builds/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
-export PKG_CONFIG_PATH=$HOME/Builds/carla/lib/pkgconfig:$HOME/Builds/carla64/lib/pkgconfig
+export PATH=$TARGETDIR/carla/bin:$TARGETDIR/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
+export PKG_CONFIG_PATH=$TARGETDIR/carla/lib/pkgconfig:$TARGETDIR/carla64/lib/pkgconfig
 
 export DEFAULT_QT=5
-export PYUIC5=/opt/carla/bin/pyuic5
+export PYUIC5=$TARGETDIR/carla/bin/pyuic5
diff --git a/source/Makefile.mk b/source/Makefile.mk
index 2f9dc569b..90138788c 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -65,12 +65,7 @@ endif
 # Set build and link flags
 
 BASE_FLAGS = -Wall -Wextra -pipe -DBUILDING_CARLA -DREAL_BUILD -MD -MP
-BASE_OPTS  = -O2 -ffast-math -mtune=generic -msse -msse2 -fdata-sections -ffunction-sections
-
-ifneq ($(MACOS),true)
-# MacOS doesn't support this
-BASE_OPTS += -mfpmath=sse
-endif
+BASE_OPTS  = -O2 -ffast-math -mtune=generic -msse -msse2 -mfpmath=sse -fdata-sections -ffunction-sections
 
 ifeq ($(MACOS),true)
 # MacOS linker flags
@@ -98,7 +93,7 @@ BASE_OPTS  = -O2 -ffast-math -fdata-sections -ffunction-sections
 endif
 
 ifneq ($(WIN32),true)
-# not needed for Windows
+# Not needed for Windows
 BASE_FLAGS += -fPIC -DPIC
 endif
 
@@ -127,14 +122,13 @@ endif
 32BIT_FLAGS = -m32
 64BIT_FLAGS = -m64
 
-BUILD_C_FLAGS   = $(BASE_FLAGS) -std=c99 -std=gnu99 $(CFLAGS)
-BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=c++0x -std=gnu++0x $(CXXFLAGS)
-LINK_FLAGS      = $(LINK_OPTS) -Wl,--no-undefined $(LDFLAGS)
-
-ifeq ($(MACOS),true)
-# No C++11 support
-BUILD_CXX_FLAGS = $(BASE_FLAGS) $(CXXFLAGS)
+BUILD_C_FLAGS   = $(BASE_FLAGS) -std=gnu99 $(CFLAGS)
+BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=gnu++11 $(CXXFLAGS)
 LINK_FLAGS      = $(LINK_OPTS) $(LDFLAGS)
+
+ifneq ($(MACOS),true)
+# Not available on MacOS
+LINK_FLAGS     += -Wl,--no-undefined
 endif
 
 # --------------------------------------------------------------
@@ -333,7 +327,9 @@ endif
 
 ifeq ($(HAVE_LINUXSAMPLER),true)
 LINUXSAMPLER_FLAGS = $(shell pkg-config --cflags linuxsampler) -DIS_CPP11=1 -Wno-non-virtual-dtor -Wno-shadow -Wno-unused-parameter
+ifeq ($(LINUX),true)
 LINUXSAMPLER_LIBS  = -Wl,-rpath=$(shell pkg-config --variable=libdir gig):$(shell pkg-config --variable=libdir linuxsampler)
+endif
 LINUXSAMPLER_LIBS += $(shell pkg-config --libs linuxsampler)
 endif