Fixed list parsing bugs