A few updates to documentation, see #3074