Master list fixes