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.