Fixups from merge tragedy