~arrow fixes