Corrected new merged-in files.