Some fixes for the lists APIs