Some changes to get Travis to build