Merge "minor documentation fixes"