Fix some bugs that were just introduced while adding the ResolveResults.