Improved some mistakes created in the merge.