Fix trivials

fix trivial problems.