Migration and travis fix attempt