Fix up dependancies