Really fix the dependency issues