Fixed: dependencies issues