Fixes other upgrade-related things