Updated stuff fixing torvus.

Samuel Keiffer requested to merge sam/fix-torvus into master Oct 30, 2021