Fixed issues with lists