Minor Fixups

Minor fixups to handle name changes and fix a deprecation warning.