Fix up all the screwed up files from 3.4.45 merge and CM