Some import fixes and such. First migration.