Small fixes and typos