diff --git a/arangod/MMFiles/MMFilesHashIndex.cpp b/arangod/MMFiles/MMFilesHashIndex.cpp
index f54fb3fa86..2029eb1036 100644
--- a/arangod/MMFiles/MMFilesHashIndex.cpp
+++ b/arangod/MMFiles/MMFilesHashIndex.cpp
@@ -433,7 +433,7 @@ MMFilesHashIndex::MultiArray::~MultiArray() {
 MMFilesHashIndex::MMFilesHashIndex(TRI_idx_iid_t iid, LogicalCollection* collection,
                      VPackSlice const& info)
     : MMFilesPathBasedIndex(iid, collection, info, sizeof(TRI_voc_rid_t) + sizeof(uint32_t), false), _uniqueArray(nullptr) {
-  uint32_t indexBuckets = 1;
+  size_t indexBuckets = 1;
 
   if (collection != nullptr) {
     auto physical = static_cast<MMFilesCollection*>(collection->getPhysical());
diff --git a/arangod/RocksDBEngine/RocksDBCollection.cpp b/arangod/RocksDBEngine/RocksDBCollection.cpp
index e8c6b335b8..2b9ad986fa 100644
--- a/arangod/RocksDBEngine/RocksDBCollection.cpp
+++ b/arangod/RocksDBEngine/RocksDBCollection.cpp
@@ -310,7 +310,7 @@ int RocksDBCollection::restoreIndex(transaction::Methods*,
 /// @brief Drop an index with the given iid.
 bool RocksDBCollection::dropIndex(TRI_idx_iid_t iid) {
   THROW_ARANGO_NOT_YET_IMPLEMENTED();
-  return false;
+  return true;
 }
 
 std::unique_ptr<IndexIterator> RocksDBCollection::getAllIterator(
@@ -733,7 +733,7 @@ int RocksDBCollection::saveIndex(transaction::Methods* trx,
 // or it's indexes are freed the pointer returned will get invalidated.
 arangodb::RocksDBPrimaryIndex* RocksDBCollection::primaryIndex() const {
   // The primary index always has iid 0
-  auto primary = _logicalCollection->lookupIndex(0);
+  auto primary = PhysicalCollection::lookupIndex(0);
   TRI_ASSERT(primary != nullptr);
 
 #ifdef ARANGODB_ENABLE_MAINTAINER_MODE
diff --git a/arangod/RocksDBEngine/RocksDBCommon.h b/arangod/RocksDBEngine/RocksDBCommon.h
index bf6b0c587b..5b667eacff 100644
--- a/arangod/RocksDBEngine/RocksDBCommon.h
+++ b/arangod/RocksDBEngine/RocksDBCommon.h
@@ -30,7 +30,7 @@
 
 #include <rocksdb/status.h>
 
-namespace rocksdb {class DB; class ReadOptions;}
+namespace rocksdb {class DB; struct ReadOptions;}
 
 namespace arangodb {
 class TransactionState;
diff --git a/arangod/RocksDBEngine/RocksDBEngine.cpp b/arangod/RocksDBEngine/RocksDBEngine.cpp
index 3c1d986bde..646d1ca7dd 100644
--- a/arangod/RocksDBEngine/RocksDBEngine.cpp
+++ b/arangod/RocksDBEngine/RocksDBEngine.cpp
@@ -520,7 +520,8 @@ void RocksDBEngine::dropIndexWalMarker(TRI_vocbase_t* vocbase,
 
 void RocksDBEngine::unloadCollection(TRI_vocbase_t* vocbase,
                                      arangodb::LogicalCollection* collection) {
-  THROW_ARANGO_NOT_YET_IMPLEMENTED();
+  // TODO: does anything have to happen
+  //THROW_ARANGO_NOT_YET_IMPLEMENTED();
 }
 
 void RocksDBEngine::createView(TRI_vocbase_t* vocbase, TRI_voc_cid_t id,
diff --git a/arangod/RocksDBEngine/RocksDBPrimaryIndex.cpp b/arangod/RocksDBEngine/RocksDBPrimaryIndex.cpp
index 39caff8c67..33e6c8dea1 100644
--- a/arangod/RocksDBEngine/RocksDBPrimaryIndex.cpp
+++ b/arangod/RocksDBEngine/RocksDBPrimaryIndex.cpp
@@ -110,7 +110,6 @@ RocksDBAllIndexIterator::RocksDBAllIndexIterator(
     : IndexIterator(collection, trx, mmdr, index),
       _cmp(index->_cmp),
       _reverse(reverse),
-      _total(0),
       _bounds(RocksDBKeyBounds::PrimaryIndex(index->objectId())) {
   // aquire rocksdb transaction
   RocksDBTransactionState* state = rocksutils::toRocksTransactionState(trx);
diff --git a/arangod/RocksDBEngine/RocksDBPrimaryIndex.h b/arangod/RocksDBEngine/RocksDBPrimaryIndex.h
index 42dfa4b8d1..a5b61812f8 100644
--- a/arangod/RocksDBEngine/RocksDBPrimaryIndex.h
+++ b/arangod/RocksDBEngine/RocksDBPrimaryIndex.h
@@ -90,7 +90,6 @@ class RocksDBAllIndexIterator final : public IndexIterator {
 
   RocksDBComparator const* _cmp;
   bool const _reverse;
-  uint64_t _total;
   std::unique_ptr<rocksdb::Iterator> _iterator;
   RocksDBKeyBounds _bounds;
 };
diff --git a/js/common/tests/shell/shell-edge-index-noncluster.js b/js/common/tests/shell/shell-edge-index-noncluster-mmfiles.js
similarity index 100%
rename from js/common/tests/shell/shell-edge-index-noncluster.js
rename to js/common/tests/shell/shell-edge-index-noncluster-mmfiles.js