Fixed some compilation error after merging.