Fix merge mistakes
Merge pull request #33 from xfurry/wotlk

Fix merge mistakes from previous commit