Try and fix travis-ci build, WIP...