Couple tiny things found on debugging in CI