fat arrow fixes