Fixed rest of dependency issues