Fixes to negotation

See Changes and commit messages for details.