MasterList fixes