Adding current changes to make cmscan install work