fix some small fix