Fix up some silly bugs and typos.