diff --git a/arangod/V8Server/v8-query.cpp b/arangod/V8Server/v8-query.cpp
index ef64c68a3c..d4cae059a5 100644
--- a/arangod/V8Server/v8-query.cpp
+++ b/arangod/V8Server/v8-query.cpp
@@ -1200,7 +1200,7 @@ static void JS_OffsetQuery (const v8::FunctionCallbackInfo<v8::Value>& args) {
 
   result->Set(TRI_V8_ASCII_STRING("total"), v8::Number::New(isolate, static_cast<double>(total)));
   result->Set(TRI_V8_ASCII_STRING("count"), v8::Number::New(isolate, static_cast<double>(n)));
-  result->Set(TRI_V8_ASCII_STRING("skip"), v8::Number::New(isolate, internalSkip));
+  result->Set(TRI_V8_ASCII_STRING("skip"), v8::Number::New(isolate, static_cast<double>(internalSkip)));
 
   TRI_V8_RETURN(result);
   TRI_V8_TRY_CATCH_END
@@ -1382,8 +1382,8 @@ static void JS_ByExampleQuery (const v8::FunctionCallbackInfo<v8::Value>& args)
     }
   }
 
-  result->Set(TRI_V8_ASCII_STRING("total"), v8::Integer::New(isolate, static_cast<double>(total)));
-  result->Set(TRI_V8_ASCII_STRING("count"), v8::Integer::New(isolate, static_cast<double>(count)));
+  result->Set(TRI_V8_ASCII_STRING("total"), v8::Number::New(isolate, static_cast<double>(total)));
+  result->Set(TRI_V8_ASCII_STRING("count"), v8::Number::New(isolate, static_cast<double>(count)));
 
   if (error) {
     TRI_V8_THROW_EXCEPTION_MEMORY();
diff --git a/arangosh/V8Client/arangorestore.cpp b/arangosh/V8Client/arangorestore.cpp
index c3fe6c42c2..21c95c4b4c 100644
--- a/arangosh/V8Client/arangorestore.cpp
+++ b/arangosh/V8Client/arangorestore.cpp
@@ -709,7 +709,7 @@ static int ProcessInputDirectory (string& errorMsg) {
         }
       }
 
-      if (! restrictList.empty() > 0 &&
+      if (! restrictList.empty() &&
           restrictList.find(cname) == restrictList.end()) {
         // collection name not in list
         TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json);