migration, tweaks