More changes related to travis-ci