Fix migrate stuff