Merge "Fix several typos." into main