Migrations cleanup

Fixed errors in settings persist for old migrations