Fix a couple minor bugs, get nego sub-package working again.