Model/migration tweaks.