More fixes following Travis