Correcting issues from merge.