Changed in scripts to (hopefully work on travis-CI