Fix a dependency issue and a doc typo.

Thanks for pulling upstream.