Another step at fixing build for Travis-CI