Empyrean: Spring 2021 Patch

A handful of bugfixes from the past two years.