Adjustments for travis-ci