diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 24a9a5b30..4ae6295ef 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -18,6 +18,7 @@ linphone_daemon_SOURCES=daemon.cc \
 			commands/firewall-policy.cc \
 			commands/help.cc \
 			commands/ipv6.cc \
+			commands/jitterbuffer.cc \
 			commands/media-encryption.cc \
 			commands/msfilter-add-fmtp.cc \
 			commands/play-wav.cc \
@@ -46,6 +47,7 @@ linphone_daemon_SOURCES=daemon.cc \
 			commands/firewall-policy.h \
 			commands/help.h \
 			commands/ipv6.h \
+			commands/jitterbuffer.h \
 			commands/media-encryption.h \
 			commands/msfilter-add-fmtp.h \
 			commands/play-wav.h \
@@ -57,8 +59,7 @@ linphone_daemon_SOURCES=daemon.cc \
 			commands/terminate.h \
 			commands/unregister.h \
 			commands/quit.h \
-			commands/version.h \
-			commands/jitterbuffer.cc commands/jitterbuffer.h
+			commands/version.h
 
 linphone_daemon_pipetest_SOURCES=daemon-pipetest.c
 
diff --git a/daemon/daemon.cc b/daemon/daemon.cc
index bed3b1afb..88e39cbaa 100644
--- a/daemon/daemon.cc
+++ b/daemon/daemon.cc
@@ -389,7 +389,6 @@ void Daemon::initCommands() {
 	mCommands.push_back(new VersionCommand());
 	mCommands.push_back(new QuitCommand());
 	mCommands.push_back(new HelpCommand());
-
 }
 
 void Daemon::uninitCommands() {
@@ -561,7 +560,7 @@ void Daemon::dumpCommandsHelp() {
 static string htmlEscape(const string &orig){
 	string ret=orig;
 	size_t pos;
-	
+
 	while(1){
 		pos=ret.find('<');
 		if (pos!=string::npos){
@@ -607,7 +606,7 @@ void Daemon::dumpCommandsHelpHtml(){
 		}
 		cout<<"</i></p>"<<endl;
 	}
-	
+
 	cout << "</body></html>"<<endl;
 }
 
@@ -738,7 +737,7 @@ int main(int argc, char *argv[]) {
 	const char *log_file = NULL;
 	bool capture_video = false;
 	bool display_video = false;
-	bool nostats=FALSE;
+	bool stats_enabled = true;
 	bool lsd_enabled = false;
 	int i;
 
@@ -786,15 +785,13 @@ int main(int argc, char *argv[]) {
 		} else if (strcmp(argv[i], "-D") == 0) {
 			display_video = true;
 		}else if (strcmp(argv[i],"--disable-stats-events")==0){
-			nostats=TRUE;
+			stats_enabled = false;
 		} else if (strcmp(argv[i], "--enable-lsd") == 0) {
 			lsd_enabled = true;
 		}
 	}
 	Daemon app(config_path, factory_config_path, log_file, pipe_name, display_video, capture_video);
-	app.enableStatsEvents(!nostats);
+	app.enableStatsEvents(stats_enabled);
 	app.enableLSD(lsd_enabled);
 	return app.run();
 }
-;
-
diff --git a/daemon/daemon.h b/daemon/daemon.h
index c56cc7203..e640bfc0b 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -54,7 +54,6 @@ private:
 class DaemonCommand {
 public:
 	virtual ~DaemonCommand() {
-
 	};
 	virtual void exec(Daemon *app, const char *args)=0;
 	bool matches(const char *name) const;