Fix up dependencies