Fix up migration ordering