Save xref state when starting from scratch
Fix node registration retries