Upgrade fix

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| Refs tickets  | #2072
| License       | MIT
| Doc PR        | -

fixes #2072 (hopefully) and adds a few other nice things.