fixes for new mapper options