Typos, fixes for last commit