Fixed some issues with adding to list