Fix MAC task and unicode / byte handling