Fix typos and other trivial cleanup