Fix and updated dependencies