diff --git a/Source/Game/DataStorage/ClientReader/BitReader.cs b/Source/Game/DataStorage/ClientReader/BitReader.cs
index 4a4830a36..07708a4fd 100644
--- a/Source/Game/DataStorage/ClientReader/BitReader.cs
+++ b/Source/Game/DataStorage/ClientReader/BitReader.cs
@@ -137,10 +137,6 @@ namespace Game.DataStorage
         {
             var val = ((bitSize + 7) / 8);
             var val1 = NextPow2((bitSize + 7) / 8);
-            if (val != val1)
-            {
-
-            }
 
             byte[] data = new byte[NextPow2((bitSize + 7) / 8)];
             unsafe
diff --git a/Source/Game/Entities/Unit/Unit.Movement.cs b/Source/Game/Entities/Unit/Unit.Movement.cs
index 143f08401..c5b9893f4 100644
--- a/Source/Game/Entities/Unit/Unit.Movement.cs
+++ b/Source/Game/Entities/Unit/Unit.Movement.cs
@@ -1537,18 +1537,18 @@ namespace Game.Entities
             Player playerMover = GetPlayerBeingMoved();
             if (playerMover)
             {
-                MoveTeleport moveTeleport = new MoveTeleport();
-                moveTeleport.MoverGUID = GetGUID();
-                moveTeleport.Pos = pos;
+                float x, y, z, o;
+                pos.GetPosition(out x, out y, out z, out o);
 
                 ITransport transportBase = GetDirectTransport();
                 if (transportBase != null)
-                {
-                    float o = 0f;
-                    transportBase.CalculatePassengerOffset(ref moveTeleport.Pos.posX, ref moveTeleport.Pos.posY, ref moveTeleport.Pos.posZ, ref o);
-                }
+                    transportBase.CalculatePassengerOffset(ref x, ref y, ref z, ref o);
+
+                MoveTeleport moveTeleport = new MoveTeleport();
+                moveTeleport.MoverGUID = GetGUID();
+                moveTeleport.Pos = new Position(x, y, z, o);
                 moveTeleport.TransportGUID.Set(GetTransGUID());
-                moveTeleport.Facing = pos.GetOrientation();
+                moveTeleport.Facing = o;
                 moveTeleport.SequenceIndex = m_movementCounter++;
                 playerMover.SendPacket(moveTeleport);
 
diff --git a/Source/Game/Maps/TransportManager.cs b/Source/Game/Maps/TransportManager.cs
index f21913a26..ae317041a 100644
--- a/Source/Game/Maps/TransportManager.cs
+++ b/Source/Game/Maps/TransportManager.cs
@@ -61,7 +61,7 @@ namespace Game.Maps
                     continue;
                 }
 
-                if (goInfo.MoTransport.taxiPathID >= CliDB.TaxiPathNodesByPath.Keys.Max())
+                if (!CliDB.TaxiPathNodesByPath.ContainsKey(goInfo.MoTransport.taxiPathID))
                 {
                     Log.outError(LogFilter.Sql, "Transport {0} (name: {1}) has an invalid path specified in `gameobject_template`.`data0` ({2}) field, skipped.", entry, goInfo.name, goInfo.MoTransport.taxiPathID);
                     continue;
diff --git a/Source/WorldServer/Server.cs b/Source/WorldServer/Server.cs
index 617750633..d8efc437d 100644
--- a/Source/WorldServer/Server.cs
+++ b/Source/WorldServer/Server.cs
@@ -186,6 +186,7 @@ namespace WorldServer
         static void ExitNow()
         {
             Log.outInfo(LogFilter.Server, "Halting process...");
+            Thread.Sleep(5000);
             Environment.Exit(-1);
         }
     }
diff --git a/Source/WorldServer/WorldServer.conf.dist b/Source/WorldServer/WorldServer.conf.dist
index 869487031..851a634cd 100644
--- a/Source/WorldServer/WorldServer.conf.dist
+++ b/Source/WorldServer/WorldServer.conf.dist
@@ -42,18 +42,18 @@ LoginDatabaseInfo.Username = "username"
 LoginDatabaseInfo.Password = "password"
 LoginDatabaseInfo.Database = "auth"
 
-WorldDatabaseInfo.Host = "127.0.0.1"
-WorldDatabaseInfo.Port = "3306"
-WorldDatabaseInfo.Username = "username"
-WorldDatabaseInfo.Password = "password"
-WorldDatabaseInfo.Database = "world"
-
 CharacterDatabaseInfo.Host = "127.0.0.1"
 CharacterDatabaseInfo.Port = "3306"
 CharacterDatabaseInfo.Username = "username"
 CharacterDatabaseInfo.Password = "password"
 CharacterDatabaseInfo.Database = "characters"
 
+WorldDatabaseInfo.Host = "127.0.0.1"
+WorldDatabaseInfo.Port = "3306"
+WorldDatabaseInfo.Username = "username"
+WorldDatabaseInfo.Password = "password"
+WorldDatabaseInfo.Database = "world"
+
 HotfixDatabaseInfo.Host = "127.0.0.1"
 HotfixDatabaseInfo.Port = "3306"
 HotfixDatabaseInfo.Username = "username"