Fixes for revision 2 of the docs