Fix dependencies
Fix config