Changed dependencies to fix tunables