Syntax updates for 2.2.x