Small hotfixes 6 typos