Small changes to make travis work