Anchor completion fixes