Fixes dependencies and upgrade step