Some fixes to arrows align.