fix migrations - DO NOT MERGE

@smathieu: this is the result after running the current instructions, it looks accurate.