Bugfixes
Change migration to upgrade