Add back some fixes that got clobbered in sync.