diff --git a/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake b/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake
index 3b2673938..a5f06e121 100644
--- a/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake
+++ b/modules/worldengine/nucleus/src/cmake/compiler/clang/settings.cmake
@@ -16,5 +16,5 @@ endif()
 
 # -Wno-narrowing needed to suppress a warning in g3d
 # -Wno-deprecated-register -Wstring-plus-int -Wpointer-bool-conversion are needed to suppress gsoap warnings on Unix systems.
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wstring-plus-int -Wparentheses")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-narrowing -Wno-deprecated-register -Wstring-plus-int -Wparentheses -Wreorder")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG=1")
diff --git a/src/game/Entities/Pet/Pet.cpp b/src/game/Entities/Pet/Pet.cpp
index 8bb6fdaeb..a0f34e86d 100644
--- a/src/game/Entities/Pet/Pet.cpp
+++ b/src/game/Entities/Pet/Pet.cpp
@@ -977,6 +977,9 @@ bool Guardian::InitStatsForLevel(uint8 petlevel)
     // Can be summon and guardian
     if (GetEntry() == NPC_RISEN_GHOUL)
     {
+        // 100% energy after summon
+        SetPower(POWER_ENERGY, GetMaxPower(POWER_ENERGY));
+        
         // xinef: fixes orc death knight command racial
         if (m_owner->getRace() == RACE_ORC)
             CastSpell(this, SPELL_ORC_RACIAL_COMMAND, true, NULL, NULL, m_owner->GetGUID());
@@ -2240,4 +2243,4 @@ void Pet::RemoveSpellCooldown(uint32 spell_id, bool update /* = false */)
             playerOwner->SendDirectMessage(&data);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp
index e07ba3533..fac6ac4bf 100644
--- a/src/game/Server/WorldSession.cpp
+++ b/src/game/Server/WorldSession.cpp
@@ -1081,9 +1081,9 @@ void WorldSession::InitializeQueryCallbackParameters()
 {
     // Callback parameters that have pointers in them should be properly
     // initialized to NULL here.
-    _charCreateCallback.SetParam(NULL);
-    _loadPetFromDBFirstCallback.SetFirstParam(NULL);
-    _loadPetFromDBFirstCallback.SetSecondParam(NULL);
+    _charCreateCallback.SetParam(nullptr);
+    _loadPetFromDBFirstCallback.SetFirstParam(0);
+    _loadPetFromDBFirstCallback.SetSecondParam(nullptr);
 }
 
 void WorldSession::ProcessQueryCallbacks()