diff --git a/arangod/Statistics/statistics.h b/arangod/Statistics/statistics.h
index 0eb70d2364..3739f82cac 100644
--- a/arangod/Statistics/statistics.h
+++ b/arangod/Statistics/statistics.h
@@ -76,11 +76,11 @@ struct TRI_request_statistics_t {
 #endif
   }
 
-  double _readStart;
-  double _readEnd;
-  double _queueStart;
-  double _queueEnd;
-  double _requestStart;
+  double _readStart;     // CommTask::processRead - read first byte of message
+  double _readEnd;       // CommTask::processRead - message complete
+  double _queueStart;    // addJob to queue GeneralServer::handleRequest
+  double _queueEnd;      // exit queue DispatcherThread::handleJob
+  double _requestStart;  // GeneralServerJob::work
   double _requestEnd;
   double _writeStart;
   double _writeEnd;
diff --git a/lib/Rest/VppMessage.h b/lib/Rest/VppMessage.h
index 0a58da709f..6b5a276548 100644
--- a/lib/Rest/VppMessage.h
+++ b/lib/Rest/VppMessage.h
@@ -24,12 +24,12 @@
 #ifndef ARANGODB_REST_VPP_MESSAGE_H
 #define ARANGODB_REST_VPP_MESSAGE_H 1
 
-#include "Basics/StringBuffer.h"
-#include <velocypack/Options.h>
 #include <velocypack/Buffer.h>
+#include <velocypack/Options.h>
 #include <velocypack/Slice.h>
 #include <velocypack/velocypack-aliases.h>
 #include <iterator>
+#include "Basics/StringBuffer.h"
 
 namespace arangodb {
 namespace rest {
@@ -71,11 +71,7 @@ struct VppInputMessage {
     return VPackSlice{};
   }
 
-  std::vector<VPackSlice> const& payloads() const {
-    if (!_payload.empty()) {
-      return _payload;
-    }
-  }
+  std::vector<VPackSlice> const& payloads() const { return _payload; }
 
  private:
   VPackBuffer<uint8_t> _buffer;