Syntax adaptations