Fixed files

These edits FIX the Fixes that Git produced during the merge from
yesterday.