Restoring TravisCI fixes