Fix typos and inconsistencies.