With the new index-v1 nearing completion, this is the last round of prep work and fixes before that lands.