Fixed Feral and Windwalker bugs