Minor fixes and typos