fix rr deprecation warnings