Tweaks to migrations, some models