Various fixes related to typos