Fixed all the broken upgrade features