diff --git a/Makefile b/Makefile
index 748b344d..4e2e133b 100644
--- a/Makefile
+++ b/Makefile
@@ -40,14 +40,14 @@ MORE_CFLAGS += -Wno-unused -Wno-format -DGCCCONSTFUNC="__attribute__((const))"
 MORE_CFLAGS += -fexceptions -fpermissive
 MORE_CFLAGS += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
 
-LDFLAGS += -lpthread -lm -lz -lpng -lrt -lxml2 -lFLAC -lmpg123 -ldl -lprofiler -ltcmalloc
+LDFLAGS += -lpthread -lm -lz -lpng -lrt -lxml2 -lFLAC -lmpg123 -ldl -ltcmalloc
 LDFLAGS += -lSDL2 -lSDL2_image -lSDL2_ttf -lguisan -L/opt/vc/lib -Lsrc/guisan/lib
 
 ifndef DEBUG
 MORE_CFLAGS += -Ofast -pipe -Wno-write-strings 
 else
 MORE_CFLAGS += -g -DDEBUG -Wl,--export-dynamic
-
+LDFLAGS += -lprofiler
 endif
 
 ASFLAGS += $(CPU_FLAGS)
diff --git a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
index 3803b668..ba7dff74 100644
--- a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
@@ -69,6 +69,7 @@
     <ProjectFile>Amiberry.vcxproj</ProjectFile>
     <RemoteBuildEnvironment>
       <Records />
+      <EnvironmentSetupFiles />
     </RemoteBuildEnvironment>
     <ParallelJobCount>1</ParallelJobCount>
   </Build>
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj
index eb996cdb..5682bb8a 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj
@@ -71,7 +71,7 @@
     <Link>
       <AdditionalLinkerInputs>-Wl,-gc-sections;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
       <LibrarySearchDirectories>../../src/guisan/lib;=/opt/vc/lib;=/usr/lib/arm-linux-gnueabihf;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;profiler;tcmalloc;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
+      <AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;tcmalloc;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript />
       <ExtraRPATH>
       </ExtraRPATH>
@@ -89,7 +89,7 @@
     <Link>
       <AdditionalLinkerInputs>-Wl,-gc-sections;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
       <LibrarySearchDirectories>../../src/guisan/lib;=/opt/vc/lib;=/usr/lib/arm-linux-gnueabihf;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;profiler;tcmalloc;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
+      <AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;tcmalloc;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript>
       </LinkerScript>
       <ExtraRPATH>
@@ -108,7 +108,7 @@
     <Link>
       <AdditionalLinkerInputs>-Wl,-gc-sections;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
       <LibrarySearchDirectories>../../src/guisan/lib;=/opt/vc/lib;=/usr/lib/arm-linux-gnueabihf;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;profiler;tcmalloc;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
+      <AdditionalLibraryNames>SDL2;SDL2_image;SDL2_ttf;pthread;m;z;png;rt;xml2;FLAC;mpg123;dl;guisan;tcmalloc;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
       <LinkerScript>
       </LinkerScript>
       <ExtraRPATH>
diff --git a/src/newcpu.cpp b/src/newcpu.cpp
index f2838c79..dc66f3da 100644
--- a/src/newcpu.cpp
+++ b/src/newcpu.cpp
@@ -50,7 +50,11 @@
 #include "cia.h"
 #include "inputdevice.h"
 #include "audio.h"
+
+#ifdef DEBUG
 #include <gperftools/profiler.h>
+#endif
+
 #ifdef JIT
 #include "jit/compemu.h"
 #include <signal.h>
diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp
index 651a9fa8..ca1dd1de 100644
--- a/src/osdep/amiberry.cpp
+++ b/src/osdep/amiberry.cpp
@@ -508,8 +508,7 @@ void ReadDirectory(const char* path, vector<string>* dirs, vector<string>* files
 	if (files != nullptr)
 		files->clear();
 
-	dir = opendir(path);
-	if (dir != nullptr)
+	if ((dir = opendir(path)) != nullptr)
 	{
 		while ((dent = readdir(dir)) != nullptr)
 		{
@@ -527,9 +526,9 @@ void ReadDirectory(const char* path, vector<string>* dirs, vector<string>* files
 	}
 
 	if (dirs != nullptr)
-		std::sort(dirs->begin(), dirs->end());
+		sort(dirs->begin(), dirs->end());
 	if (files != nullptr)
-		std::sort(files->begin(), files->end());
+		sort(files->begin(), files->end());
 }
 
 void saveAdfDir()