4.0 Release Fix for Blizzard Changes