Minor fixes for the legacy support of merging of results