TravisCI fixes