Doc fixes and a deprecation fix.