Corrected a couple of issues after the merge.