Reformat to not use a where clause
Correct bug that skipped upgrades of existing packages