fix some little troubles.