Collate fix and Variable fix for more stability and support