More small mempool indexing fixes