Fix/dependency errors