RDOC fixes