more fixes on branch join imperfections