Updates to make topic updates more robust.