- Fix arrows not being used correctly.