Fix typo and migrate