Fix windwalker bugs