Fixed things lost in merging.