diff --git a/src/core/graphics/RenderTarget.cpp b/src/core/graphics/RenderTarget.cpp
index 496f44a29a3079f8264365cf8598c164497a000c..06b3bbcf8ecd9b165acf3c4825678ea9aa8b36d5 100644
--- a/src/core/graphics/RenderTarget.cpp
+++ b/src/core/graphics/RenderTarget.cpp
@@ -12,7 +12,7 @@
 
 
 #include "core/graphics/RenderTarget.hpp"
-#define HEADLESS
+//#define HEADLESS
 
 namespace sibr
 {
diff --git a/src/core/graphics/Texture.cpp b/src/core/graphics/Texture.cpp
index 55dd47336fe3de6b5b3de7a4d416a6640ebb79cc..ba6c401685f9a02e5a77a7d14ddad397b6efe694 100644
--- a/src/core/graphics/Texture.cpp
+++ b/src/core/graphics/Texture.cpp
@@ -12,7 +12,7 @@
 
 
 #include "core/graphics/Texture.hpp"
-#define HEADLESS
+//#define HEADLESS
 
 namespace sibr
 {
diff --git a/src/core/graphics/Texture.hpp b/src/core/graphics/Texture.hpp
index d7c38b66866b014f904ef858164fdd9b2e553608..87d9a68c24d48984924e63d78331b5ade551ac11 100644
--- a/src/core/graphics/Texture.hpp
+++ b/src/core/graphics/Texture.hpp
@@ -1334,7 +1334,7 @@ namespace sibr
 	template<typename T_Type, unsigned int T_NumComp>
 	Vector4f	Texture2DArray<T_Type, T_NumComp>::readBackPixel(int i, int x, int y, uint lod) const {
 		Vector4f out;
-#define HEADLESS
+//#define HEADLESS
 #ifdef HEADLESS
 		SIBR_ERR << "HEADLESS -- No support for readBackPixel" << std::endl;
 #else
diff --git a/src/core/system/Utils.cpp b/src/core/system/Utils.cpp
index 3961d7b72d3e7e5851b087c0b7b09a596c98be80..5a399d851ec162342dbfe2c6b6b9e8e59423ee8c 100755
--- a/src/core/system/Utils.cpp
+++ b/src/core/system/Utils.cpp
@@ -428,7 +428,7 @@ namespace sibr
 	bool showFilePicker(std::string & selectedElement,
 
 		const FilePickerMode mode, const std::string & directoryPath, const std::string & extensionsAllowed) {
-#ifdef USE_NFD
+#if defined(USE_NFD) || defined(SIBR_OS_WINDOWS)
 		nfdchar_t *outPath = NULL;
 		nfdresult_t result = NFD_CANCEL;
 		
diff --git a/src/core/video/FFmpegVideoEncoder.hpp b/src/core/video/FFmpegVideoEncoder.hpp
index cca9dfb2872b5c0b9bbecacd33dc02515507d65d..18f92a1849748cf6c449cd7f3ba08a21dcb46d13 100644
--- a/src/core/video/FFmpegVideoEncoder.hpp
+++ b/src/core/video/FFmpegVideoEncoder.hpp
@@ -83,7 +83,7 @@ namespace sibr {
 		\param frame the frame to encode
 		\return a success flag.
 		*/
-#define HEADLESS
+//#define HEADLESS
 #ifndef HEADLESS
 		bool encode(AVFrame *frame);
 #endif