Dependencies and wording fixes