Fixes for lists
Merge remote-tracking branch 'origin/master'