some small fix after merge