Fixed/merged typos