Fixing up the migrations situation