Updated some depdencies
Some fixes