fix remaining deprecation warnings