More anchor-style fixes.