Update and correct dependencies