ESSENTIALS-294: Fix anchors