Fix depreciated references.