Fixes on migration
Fixes on dependency and author email
Fixes on indentation