Fix mozilla imports and indexer