[CLC-2123] Directives fixes