fix some small problem