Revert "Revert "update small fixs""

This reverts commit bdad1e57b11b11de1596bdd2373a1d6000655154.