Fixing up the last several files.