common ancestor fixes