Some fixes and typos