rich doc fixes