Fix a couple of typos and 80-col.