Fixes to the docs ready for merge to stable.