Doc fixes and a deprecation fix.

Doc fixes and a deprecation fix.