Fix migrations
New Bb with minor migration fixes