master: Fixing up migration a bit