Fixing some crashs related to hyjal and some other zones