Minor changes for correcting typos
merge head