Some changes to find out why the Travis Build is failing