Fix some typos and changes that were forgotten
Merge branch 'congolo' into congolo-test-directcall