some small fixed