fix several error