Refresh more fixes to Anchors