Fix errors from travis-ci