some more updates to make travis-ci work