Wintergrasp R3.4

* More fix.