Fix up more dependencies