Land a few PRs and updates to master all in 1

Need to land them all as one unit to actually pass the whole test suite.