Fix createArrow functions