fixed migration bugs, somebody is getting pie ;)