Quick documentation merge fixes