Fix error management
Fix dependency management