Fixes for WoW 6.0

Obviously these changes are incompatible with the Live client, but I figured I might offer the PR anyway, before I forget later.