Doc fixups fixes #571