Fixes from the live tests on git.arzaroth.com
All checks were successful
CI / gate (pull_request) Successful in 2m31s