Additional merge updates

Fixing some merge conflicts, mostly.