DOC: Fixes following comments from Stefan.