Some generated stubs were manually adjusted due to minor issues in the stub generator. In particular, ambiguous references were resolved and references to private classes were removed.