Some small fixes and typos