Corrected things from the merge.