Fix dependencies and various typos