Migration and form tweaks