No spaces and fixes for .travis-ci builds.