Fixups and test fixes post-rebase