Sort out some migrations