Fix indexing suite compilation problems