Fixes list ordering assertion failures