Documentation fixes
Fixing bug 1179