Fix delayed conref resolution