fix remaining recursive type related errors