Brewmaster/Windwalker Fixes.