diff --git a/libsrc/bonjour/bonjourserviceregister.cpp b/libsrc/bonjour/bonjourserviceregister.cpp
index 1d040688..a0dcc96a 100755
--- a/libsrc/bonjour/bonjourserviceregister.cpp
+++ b/libsrc/bonjour/bonjourserviceregister.cpp
@@ -26,15 +26,15 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-//#include "bonjourserviceregister.h"
 #include <bonjour/bonjourserviceregister.h>
-
+#include <stdlib.h>
 
 #include <QtCore/QSocketNotifier>
 
 BonjourServiceRegister::BonjourServiceRegister(QObject *parent)
     : QObject(parent), dnssref(0), bonjourSocket(0)
 {
+	setenv("AVAHI_COMPAT_NOWARN", "1", 1);
 }
 
 BonjourServiceRegister::~BonjourServiceRegister()
diff --git a/src/hyperiond/main.cpp b/src/hyperiond/main.cpp
index a297b33c..66b0ca41 100644
--- a/src/hyperiond/main.cpp
+++ b/src/hyperiond/main.cpp
@@ -183,7 +183,7 @@ int main(int argc, char** argv)
 	#endif
 
 	#if !defined(ENABLE_DISPMANX) && !defined(ENABLE_OSX) && !defined(ENABLE_FB)
-		ErrorIf(config.isMember("framegrabber"), log, "No grabber can be instantiated, because all grabbers have been left out from the build" << std::endl;
+		ErrorIf(config.isMember("framegrabber"), log, "No grabber can be instantiated, because all grabbers have been left out from the build");
 	#endif
 
 	// run the application