Add refs.
Fix merge.