do some small fix