fix several places

fix several places