Add missing files from last sync.
Add back some fixes that got clobbered in sync.