More Windwalker Tweaks