Updated doclets

Misc changes.
Committing to merge upstream changes.