Fix some compilation issues from the merge.