Deal with missing and type-changed files