diff --git a/src/server/game/Server/Packets/MovementPackets.h b/src/server/game/Server/Packets/MovementPackets.h
index e9421952c33..5e186a041ba 100644
--- a/src/server/game/Server/Packets/MovementPackets.h
+++ b/src/server/game/Server/Packets/MovementPackets.h
@@ -683,7 +683,7 @@ namespace WorldPackets
                 uint16 MessageID = 0;
                 uint32 SequenceIndex = 0;
                 Optional<float> Speed;
-                Optional<SpeedRange> SpeedRange;
+                Optional<MoveSetCompoundState::SpeedRange> SpeedRange;
                 Optional<KnockBackInfo> KnockBack;
                 Optional<int32> VehicleRecID;
                 Optional<CollisionHeightInfo> CollisionHeight;
diff --git a/src/server/shared/DataStores/DB2Store.h b/src/server/shared/DataStores/DB2Store.h
index 367c3d0791b..52f907cb279 100644
--- a/src/server/shared/DataStores/DB2Store.h
+++ b/src/server/shared/DataStores/DB2Store.h
@@ -65,6 +65,8 @@ protected:
     std::vector<char*> _stringPool;
     char** _indexTable;
     uint32 _indexTableSize;
+
+    friend class UnitTestDataLoader;
 };
 
 template<class T>
@@ -82,8 +84,6 @@ public:
 
     iterator begin() const { return iterator(reinterpret_cast<T const* const*>(_indexTable), _indexTableSize); }
     iterator end() const { return iterator(reinterpret_cast<T const* const*>(_indexTable), _indexTableSize, _indexTableSize); }
-
-    friend class UnitTestDataLoader;
 };
 
 #endif
diff --git a/tests/DummyData.h b/tests/DummyData.h
index 35ec4d62e86..eb0c84ddefa 100644
--- a/tests/DummyData.h
+++ b/tests/DummyData.h
@@ -48,15 +48,15 @@ class UnitTestDataLoader
                 LoaderGuard Loader() { return {*this}; }
                 void Dump()
                 {
-                    delete[] _store._indexTable.AsT;
+                    delete[] _store._indexTable;
                     for (T const& entry : _storage)
                         if (entry.*ID >= _store._indexTableSize)
                             _store._indexTableSize = entry.*ID + 1;
-                    _store._indexTable.AsT = new T*[_store._indexTableSize];
+                    _store._indexTable = new char*[_store._indexTableSize];
                     for (size_t i = 0; i < _store._indexTableSize; ++i)
-                        _store._indexTable.AsT[i] = nullptr;
+                        _store._indexTable[i] = nullptr;
                     for (T& entry : _storage)
-                        _store._indexTable.AsT[entry.*ID] = &entry;
+                        _store._indexTable[entry.*ID] = reinterpret_cast<char*>(&entry);
                 }
 
             private: