Fix remaining deprecation warnings.