Fix some typos/bugs