fix several