Improving topological consistancy fixes in CMS