Hunter and ele shaman fixes