Various minor updates

For those that have PRs waiting, please make sure they have been rebased
for this version to avoid any conflicts.