Windwalker Toggle Fixes