Some fixes to dependencies