Fix map/unmap mismatches