Fix a couple of bugs inside of oonibclient.