Preparations for list merging and small improvements