Fixups for issues caused by rebasing