arrow fixes