Fix dependencies and config