Multiple fixes/updates from TrinityCore/TrinityCore