Continued attempts at fixing dependencies