Fix migration issues with starter