Resolve documentation problems reported in #550