Fix migration, strings and use of dict()