Changes to eliminate deprecation warnings