diff --git a/src/ebusd/baseloop.cpp b/src/ebusd/baseloop.cpp
index e0979d60..08d91d6d 100644
--- a/src/ebusd/baseloop.cpp
+++ b/src/ebusd/baseloop.cpp
@@ -604,17 +604,17 @@ string BaseLoop::decodeMessage(const string& data, bool& listening)
 		       << " read      - read ebus values            'read [-v] [-f] [-m seconds] [-c class] name [field]'" << endl
 		       << " write     - write ebus values           'write class name value[;value]*' or 'write -h ZZPBSBNNDx'" << endl
 		       << " find      - find ebus values            'find [-v] [-r] [-w] [-p] [-d] [-c class] [name]'" << endl
-		       << " listen    - listen for updates          'listen'" << endl << endl
+		       << " listen    - listen for updates          'listen'" << endl
 		       << " scan      - scan ebus known addresses   'scan'" << endl
 		       << "           - scan ebus all addresses     'scan full'" << endl
-		       << "           - show scan results           'scan result'" << endl << endl
+		       << "           - show scan results           'scan result'" << endl
  		       << " log       - change log areas            'log areas area,area,..' (areas: bas|net|bus|upd|all)" << endl
-		       << "           - change log level            'log level level'        (level: error|event|trace|debug)" << endl << endl
+		       << "           - change log level            'log level level'        (level: error|event|trace|debug)" << endl
 		       << " raw       - toggle log raw data         'raw'" << endl
-		       << " dump      - toggle dump state           'dump'" << endl << endl
-		       << " reload    - reload ebus configuration   'reload'" << endl << endl
+		       << " dump      - toggle dump state           'dump'" << endl
+		       << " reload    - reload ebus configuration   'reload'" << endl
 		       << " stop      - stop daemon                 'stop'" << endl
-		       << " quit      - close connection            'quit'" << endl << endl
+		       << " quit      - close connection            'quit'" << endl
 		       << " help      - print this page             'help'";
 		break;
 
diff --git a/src/tools/ebusctl.cpp b/src/tools/ebusctl.cpp
index 8179403d..bcc95656 100644
--- a/src/tools/ebusctl.cpp
+++ b/src/tools/ebusctl.cpp
@@ -64,7 +64,7 @@ string fetchData(TCPSocket* socket, bool& listening)
 
 	// set timeout
 	tdiff.tv_sec = 0;
-	tdiff.tv_nsec = 100000;
+	tdiff.tv_nsec = 1E8;
 
 #ifdef HAVE_PPOLL
 	int nfds = 2;