Fixing up minor errors introduced when resolving the merge conflicts.