Hi Alex,
good that you found by yourself how to upgrade and shared the issues you encountered during upgrade but instead of closing this thread as assumed answered would be better to close it assigning your answer as "correct answer" so all the user will found quickly the solution.
Thanks and regards
Roberto