Fixing up a few things that only occur with the full build-test.