more bugfixes wehhh #11745

Job	Run time
Start Gate	1s
Collect data for other tasks	13s
Run Linters	2m 24s
Compile Maps	2m 29s
Windows Build	1m 54s
Integration Tests (blueshift) / run_integration_tests	9m 27s
Integration Tests (boxstation) / run_integration_tests	9m 31s
Integration Tests (deltastation) / run_integration_tests	9m 10s
Integration Tests (icebox) / run_integration_tests	14m 0s
Integration Tests (kilostation) / run_integration_tests	8m 59s
Integration Tests (metastation) / run_integration_tests	9m 0s
Integration Tests (multiz_debug) / run_integration_tests	8m 31s
Integration Tests (ouroboros) / run_integration_tests	13m 25s
Integration Tests (runtimestation) / run_integration_tests	8m 49s
Integration Tests (tramstation) / run_integration_tests	13m 54s
Integration Tests (voidraptor) / run_integration_tests	14m 26s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	8m 43s
Compare Screenshot Tests	19s
Completion Gate	4s
	2h 15m 19s

Provide feedback