map eviction improvements review fixes