Working the bugs out of activity forking and joining