Merged doc tweaks