RRD: bug fixes.

Change-Id: I5d3ca569ce7289fcb117ed4f9468ba3256884dfc