Fix a bunch of stuff to improve list element conversion