Fixed merge.

Added some stuff that got lost in the merge.