Upgrade fix to entire app