Fix minor compile err left from merging branchs