RRD: bug fixes.

Change-Id: I8828f137e4fdde55b88fb8a7e632702bee7fb4b9