Unbreak migrations, get more specific with tavis, refs T160