Some changes in attempt to get travis build to work