various small fixes mapper