fix several classes definition