Small fixes to indexer and h5.