diff --git a/libsrc/grabber/x11/X11Grabber.cpp b/libsrc/grabber/x11/X11Grabber.cpp
index 5b662288..fb860136 100644
--- a/libsrc/grabber/x11/X11Grabber.cpp
+++ b/libsrc/grabber/x11/X11Grabber.cpp
@@ -187,7 +187,7 @@ int X11Grabber::updateScreenDimensions()
 	
 	_croppedHeight =  (_screenHeight > unsigned(_cropTop + _cropBottom))
 		? (_screenHeight - _cropTop - _cropBottom)
-		: (_croppedHeight = _screenHeight);
+		: _screenHeight;
 
 	std::cout << "X11GRABBER INFO: Using ";
 
diff --git a/libsrc/leddevice/LedDeviceAtmoOrb.cpp b/libsrc/leddevice/LedDeviceAtmoOrb.cpp
index 5211887d..857fcd37 100644
--- a/libsrc/leddevice/LedDeviceAtmoOrb.cpp
+++ b/libsrc/leddevice/LedDeviceAtmoOrb.cpp
@@ -30,7 +30,7 @@ LedDeviceAtmoOrb::LedDeviceAtmoOrb(
 	groupAddress = QHostAddress(multicastGroup);
 
 	udpSocket = new QUdpSocket(this);
-	udpSocket->bind(QHostAddress::AnyIPv4, multiCastGroupPort, QUdpSocket::ShareAddress | QUdpSocket::ReuseAddressHint);
+	udpSocket->bind(QHostAddress::Any, multiCastGroupPort, QUdpSocket::ShareAddress | QUdpSocket::ReuseAddressHint);
 
 	joinedMulticastgroup = udpSocket->joinMulticastGroup(groupAddress);
 }
diff --git a/libsrc/utils/CMakeLists.txt b/libsrc/utils/CMakeLists.txt
index 3e02ec6b..8bfd237d 100644
--- a/libsrc/utils/CMakeLists.txt
+++ b/libsrc/utils/CMakeLists.txt
@@ -49,5 +49,10 @@ add_library(hyperion-utils
 	${CURRENT_SOURCE_DIR}/jsonschema/JsonSchemaChecker.cpp
 )
 
+if(ENABLE_QT5)
+	qt5_use_modules(hyperion-utils Widgets)
+endif()
+
 target_link_libraries(hyperion-utils
-	jsoncpp)
+	jsoncpp
+	${QT_LIBRARIES})
diff --git a/libsrc/utils/Logger.cpp b/libsrc/utils/Logger.cpp
index 1b865d43..b451583b 100644
--- a/libsrc/utils/Logger.cpp
+++ b/libsrc/utils/Logger.cpp
@@ -30,7 +30,8 @@ Logger* Logger::getInstance(std::string name, Logger::LogLevel minLevel)
 	if ( LoggerMap->find(name) == LoggerMap->end() )
 	{
 		Logger* log = new Logger(name,minLevel);
-		Logger::LoggerMap->emplace(name,log);
+		Logger::LoggerMap->insert(std::pair<std::string,Logger*>(name,log)); // compat version, replace it with following line if we have 100% c++11
+		//Logger::LoggerMap->emplace(name,log);  // not compat with older linux distro's e.g. wheezy
 		return log;
 	} 
 	
diff --git a/src/hyperion-aml/hyperion-aml.cpp b/src/hyperion-aml/hyperion-aml.cpp
index 4932c0dc..efd95fec 100644
--- a/src/hyperion-aml/hyperion-aml.cpp
+++ b/src/hyperion-aml/hyperion-aml.cpp
@@ -35,7 +35,7 @@ int main(int argc, char ** argv)
 	try
 	{
 		// create the option parser and initialize all parameters
-		OptionsParser optionParser("X11 capture application for Hyperion");
+		OptionsParser optionParser("AmLogic capture application for Hyperion");
 		ParameterSet & parameters = optionParser.getParameters();
 
 		IntParameter           & argFps             = parameters.add<IntParameter>          ('f', "framerate",        "Capture frame rate [default: 10]");
diff --git a/src/hyperion-framebuffer/hyperion-framebuffer.cpp b/src/hyperion-framebuffer/hyperion-framebuffer.cpp
index b4c7f830..d33603a0 100644
--- a/src/hyperion-framebuffer/hyperion-framebuffer.cpp
+++ b/src/hyperion-framebuffer/hyperion-framebuffer.cpp
@@ -27,7 +27,7 @@ int main(int argc, char ** argv)
 	try
 	{
 		// create the option parser and initialize all parameters
-		OptionsParser optionParser("X11 capture application for Hyperion");
+		OptionsParser optionParser("FrameBuffer capture application for Hyperion");
 		ParameterSet & parameters = optionParser.getParameters();
 
 		StringParameter        & argDevice          = parameters.add<StringParameter>       ('d', "device",           "Set the video device [default: /dev/video0]");
diff --git a/src/hyperion-osx/hyperion-osx.cpp b/src/hyperion-osx/hyperion-osx.cpp
index dbb51575..f1d11b74 100644
--- a/src/hyperion-osx/hyperion-osx.cpp
+++ b/src/hyperion-osx/hyperion-osx.cpp
@@ -27,7 +27,7 @@ int main(int argc, char ** argv)
 	try
 	{
 		// create the option parser and initialize all parameters
-		OptionsParser optionParser("X11 capture application for Hyperion");
+		OptionsParser optionParser("OSX capture application for Hyperion");
 		ParameterSet & parameters = optionParser.getParameters();
 
 		IntParameter           & argDisplay         = parameters.add<IntParameter>          ('d', "display",          "Set the display to capture [default: 0]");
diff --git a/src/hyperion-x11/hyperion-x11.cpp b/src/hyperion-x11/hyperion-x11.cpp
index 1c9f4d65..c308828e 100644
--- a/src/hyperion-x11/hyperion-x11.cpp
+++ b/src/hyperion-x11/hyperion-x11.cpp
@@ -9,6 +9,7 @@
 #include "protoserver/ProtoConnectionWrapper.h"
 #include "X11Wrapper.h"
 #include "HyperionConfig.h"
+#include "utils/Profiler.h"
 
 using namespace vlofgren;
 
@@ -22,10 +23,10 @@ void saveScreenshot(const char * filename, const Image<ColorRgb> & image)
 
 int main(int argc, char ** argv)
 {
-  std::cout
-	<< "hyperion-x11:" << std::endl
-	<< "\tversion   : " << HYPERION_VERSION_ID << std::endl
-	<< "\tbuild time: " << __DATE__ << " " << __TIME__ << std::endl;
+	 std::cout
+		<< "hyperion-x11:" << std::endl
+		<< "\tversion   : " << HYPERION_VERSION_ID << std::endl
+		<< "\tbuild time: " << __DATE__ << " " << __TIME__ << std::endl;
 
 	QCoreApplication app(argc, argv);
 
diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp
index 110244d8..a8e7a466 100644
--- a/src/hyperiond/hyperiond.cpp
+++ b/src/hyperiond/hyperiond.cpp
@@ -418,15 +418,23 @@ int main(int argc, char** argv)
 	setlocale(LC_ALL, "C");
 	QLocale::setDefault(QLocale::c());
 
-	OptionsParser optionParser("X11 capture application for Hyperion");
+	OptionsParser optionParser("Hyperion Daemon");
 	ParameterSet & parameters = optionParser.getParameters();
 
 	IntParameter           & argParentPid             = parameters.add<IntParameter>          (0x0, "parent",        "pid of parent hyperiond");
+	SwitchParameter<>      & argHelp                  = parameters.add<SwitchParameter<>>     ('h', "help",          "Show this help message and exit");
 
 	argParentPid.setDefault(0);
 	optionParser.parse(argc, const_cast<const char **>(argv));
 	const std::vector<std::string> configFiles = optionParser.getFiles();
 
+	// check if we need to display the usage. exit if we do.
+	if (argHelp.isSet())
+	{
+		optionParser.usage();
+		return 0;
+	}
+
 	if (configFiles.size() == 0)
 	{
 		std::cout << "ERROR: Missing required configuration file. Usage:" << std::endl;