Fixes for non-unique lists