Initial migration fix