diff --git a/colorchord2/main.c b/colorchord2/main.c
index 4136a90..0f766bf 100644
--- a/colorchord2/main.c
+++ b/colorchord2/main.c
@@ -17,11 +17,11 @@
 #include "parameters.h"
 #include "hook.h"
 #include "configs.h"
-#include <winsock2.h>
 
 struct SoundDriver * sd;
 
 #if defined(WIN32) || defined(USE_WINDOWS)
+#include <winsock2.h>
 #include <windows.h>
 
 #define ESCAPE_KEY 0x1B
diff --git a/colorchord2/netlight.conf b/colorchord2/netlight.conf
index c426aad..edc1ce1 100644
--- a/colorchord2/netlight.conf
+++ b/colorchord2/netlight.conf
@@ -12,7 +12,8 @@ steady_bright = 0
 #dft_q = 20.0000
 #dft_speedup = 1000.0000
 
-sourcename = alsa_output.pci-0000_01_00.1.hdmi-stereo-extra1.monitor
+sourcename = alsa_output.pci-0000_01_00.1.hdmi-stereo.monitor
+# alsa_output.pci-0000_01_00.1.hdmi-stereo-extra1.monitor
 #alsa_output.pci-0000_00_1f.3.analog-stereo.monitor
 skipfirst = 1
 firstval = 0
diff --git a/colorchord2/outdrivers.h b/colorchord2/outdrivers.h
index db3afce..44db767 100644
--- a/colorchord2/outdrivers.h
+++ b/colorchord2/outdrivers.h
@@ -41,6 +41,6 @@ struct DriverInstances * SetupOutDriver( );
 void RegOutDriver( const char * ron, struct DriverInstances * (*Init)( ) );
 
 #define REGISTER_OUT_DRIVER( name ) \
-	void REGISTER##name() __attribute__((constructor)) { RegOutDriver( #name, name ); }
+	void __attribute__((constructor)) REGISTER##name() { RegOutDriver( #name, name ); }
 
 #endif
diff --git a/colorchord2/parameters.h b/colorchord2/parameters.h
index b6c2fe2..db1eecf 100644
--- a/colorchord2/parameters.h
+++ b/colorchord2/parameters.h
@@ -58,7 +58,7 @@ void SetParametersFromString( const char * string );
 void AddCallback( const char * name, ParamCallbackT t, void * v );
 
 #define REGISTER_PARAM( parameter_name, type ) \
-	void REGISTER##parameter_name() __attribute__((constructor)) { RegisterValue( #parameter_name, type, &parameter_name, sizeof( parameter_name ) ); }
+	void __attribute__((constructor))  REGISTER##parameter_name() { RegisterValue( #parameter_name, type, &parameter_name, sizeof( parameter_name ) ); }
 
 
 #endif
diff --git a/colorchord2/sound.h b/colorchord2/sound.h
index d83ed9b..38a7f19 100644
--- a/colorchord2/sound.h
+++ b/colorchord2/sound.h
@@ -35,7 +35,7 @@ void CloseSound( struct SoundDriver * soundobject );
 void RegSound( int priority, const char * name, SoundInitFn * fn );
 
 #define REGISTER_SOUND( sounddriver, priority, name, function ) \
-	void REGISTER##sounddriver() __attribute__((constructor)) { RegSound( priority, name, function ); }
+	void __attribute__((constructor)) REGISTER##sounddriver() { RegSound( priority, name, function ); }
 
 #endif