Some more dependency fixes