Dependencies updated and fixed