resolve issues like invalid refs, etc