Misc fixes to help CI
Created by: bjackman
These fixes aren't 100% necessary now but they fix real issues and later PRs will need them for the CI to pass.
GitLab Maintenance scheduled for Thursday, 18th December 2025, from 7:00 AM to 10:00 AM BST. GitLab will be in read-only mode and experience short periods of complete downtime (up to 20 minutes) during this window.
Created by: bjackman
These fixes aren't 100% necessary now but they fix real issues and later PRs will need them for the CI to pass.