more arrow fixes