Minor bugfixes (mostly typos)