Small fixes and cleanup

Items are added to the list after creation