fix some small issue