Fix migration and models