Various fixes again #662

Job	Run time
Start Gate	1s
Run Linters	2m 38s
Collect data for other tasks	13s
Compile Maps	2m 41s
Windows Build	1m 58s
Integration Tests (birdshot) / run_integration_tests	10m 29s
Integration Tests (deltastation) / run_integration_tests	11m 23s
Integration Tests (gateway_test) / run_integration_tests	11m 43s
Integration Tests (icebox) / run_integration_tests	10m 40s
Integration Tests (metastation) / run_integration_tests	10m 22s
Integration Tests (multiz_debug) / run_integration_tests	9m 43s
Integration Tests (northstar) / run_integration_tests	11m 32s
Integration Tests (runtimestation) / run_integration_tests	9m 44s
Integration Tests (wawastation) / run_integration_tests	11m 2s
Integration Tests (tramstation) / run_integration_tests	11m 17s
Alternate Tests (515, 1627, runtimestation) / run_integration_tests	9m 46s
Compare Screenshot Tests	16s
Completion Gate	3s
	2h 5m 31s

Provide feedback