Some nits fixed.

    * fix some setup problem