Fix typos and other minor cleanup