Fix arrow functions

Fix createArrow functions