Minor tweaks to update propagation