Commit various fixes and typos