Transit and Flat Lists fixed