A few fixes and typos