Merge "Fixing some typos." into main