Hopefully cleared up migration issues