Fixes for broken merge items

These files need to be merged in their entirety.