fix several defects