Misc. refreshes after conflict resolution