Clear up deprecation warnings