*8727* Changes to work on travis