Corrected a few errors caused by a conflict in last merge.