Fixes and typos