Fixed typos after merge