RD office fixes.

Fixes broken RD office.