Changes to get travis.ci working