Rolling up some more PRs