Rolling up small PRs in the queue

The last commit has the closed PRs