Minor documentation and merge fixes