Upgrader fixes

Here are some legacy upgrader fixes