Remove more deprecation warnings