Typos and other fixes