Fix dependencies and installation