Fix small things
Adjust migration
Merge pull request #1181 from onepercentclub/feature/sf-sync

Fix small things