Some more changes in an attempt to make travis work.