Fixes post upgrade