Deprecation fixes, doc fix

Fixed some deprecated method usages here and there, fixed a stale docblock.