Some ends that got lost in last merge are now found.