A few tweaks required for pantsbuild migration.