Fixup on ubuntu environment, part1