fixed more deprecation warnings