Fixing up List implementations